summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac4
-rw-r--r--docs/plugins/inspect/plugin-aiff.xml (renamed from docs/plugins/inspect/plugin-aiffparse.xml)8
-rw-r--r--gst-plugins-bad.spec.in2
-rw-r--r--gst/aiff/Makefile.am15
-rw-r--r--gst/aiff/aiffparse.c (renamed from gst/aiffparse/aiffparse.c)2
-rw-r--r--gst/aiff/aiffparse.h (renamed from gst/aiffparse/aiffparse.h)0
-rw-r--r--gst/aiffparse/Makefile.am15
-rw-r--r--po/POTFILES.in2
8 files changed, 24 insertions, 24 deletions
diff --git a/configure.ac b/configure.ac
index 6092881aa..b05d6ece9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -254,7 +254,7 @@ dnl *** plug-ins to include ***
dnl these are all the gst plug-ins, compilable without additional libs
AG_GST_CHECK_PLUGIN(aacparse)
AG_GST_CHECK_PLUGIN(adpcmdec)
-AG_GST_CHECK_PLUGIN(aiffparse)
+AG_GST_CHECK_PLUGIN(aiff)
AG_GST_CHECK_PLUGIN(amrparse)
AG_GST_CHECK_PLUGIN(asfmux)
AG_GST_CHECK_PLUGIN(autoconvert)
@@ -1735,7 +1735,7 @@ gst-plugins-bad.spec
gst/Makefile
gst/aacparse/Makefile
gst/adpcmdec/Makefile
-gst/aiffparse/Makefile
+gst/aiff/Makefile
gst/amrparse/Makefile
gst/asfmux/Makefile
gst/autoconvert/Makefile
diff --git a/docs/plugins/inspect/plugin-aiffparse.xml b/docs/plugins/inspect/plugin-aiff.xml
index a141af6f6..45c7fa5ab 100644
--- a/docs/plugins/inspect/plugin-aiffparse.xml
+++ b/docs/plugins/inspect/plugin-aiff.xml
@@ -1,8 +1,8 @@
<plugin>
- <name>aiffparse</name>
+ <name>aiff</name>
<description>Parse an .aiff file into raw audio</description>
- <filename>../../gst/aiffparse/.libs/libgstaiffparse.so</filename>
- <basename>libgstaiffparse.so</basename>
+ <filename>../../gst/aiffparse/.libs/libgstaiff.so</filename>
+ <basename>libgstaiff.so</basename>
<version>0.10.16</version>
<license>LGPL</license>
<source>gst-plugins-bad</source>
@@ -31,4 +31,4 @@
</pads>
</element>
</elements>
-</plugin> \ No newline at end of file
+</plugin>
diff --git a/gst-plugins-bad.spec.in b/gst-plugins-bad.spec.in
index 0679867c1..56b2ea00c 100644
--- a/gst-plugins-bad.spec.in
+++ b/gst-plugins-bad.spec.in
@@ -99,7 +99,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/gstreamer-%{majorminor}/libgstsubenc.so
%{_libdir}/gstreamer-%{majorminor}/libgstoss4audio.so
%{_libdir}/gstreamer-%{majorminor}/libresindvd.so
-%{_libdir}/gstreamer-%{majorminor}/libgstaiffparse.so
+%{_libdir}/gstreamer-%{majorminor}/libgstaiff.so
%{_libdir}/gstreamer-%{majorminor}/libgstdccp.so
%{_libdir}/gstreamer-%{majorminor}/libgstpcapparse.so
%{_libdir}/gstreamer-%{majorminor}/libgstmpegtsmux.so
diff --git a/gst/aiff/Makefile.am b/gst/aiff/Makefile.am
new file mode 100644
index 000000000..8f4b3fc4a
--- /dev/null
+++ b/gst/aiff/Makefile.am
@@ -0,0 +1,15 @@
+plugin_LTLIBRARIES = libgstaiff.la
+
+libgstaiff_la_SOURCES = aiffparse.c
+libgstaiff_la_CFLAGS = \
+ $(GST_BASE_CFLAGS) \
+ $(GST_PLUGINS_BASE_CFLAGS) \
+ $(GST_CFLAGS)
+libgstaiff_la_LIBADD = \
+ $(GST_PLUGINS_BASE_LIBS) \
+ $(GST_BASE_LIBS) \
+ $(LIBM)
+libgstaiff_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstaiff_la_LIBTOOLFLAGS = --tag=disable-static
+
+noinst_HEADERS = aiffparse.h
diff --git a/gst/aiffparse/aiffparse.c b/gst/aiff/aiffparse.c
index 7581d013d..c62107857 100644
--- a/gst/aiffparse/aiffparse.c
+++ b/gst/aiff/aiffparse.c
@@ -1605,6 +1605,6 @@ plugin_init (GstPlugin * plugin)
GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR,
- "aiffparse",
+ "aiff",
"Parse an .aiff file into raw audio",
plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/gst/aiffparse/aiffparse.h b/gst/aiff/aiffparse.h
index daca59ccf..daca59ccf 100644
--- a/gst/aiffparse/aiffparse.h
+++ b/gst/aiff/aiffparse.h
diff --git a/gst/aiffparse/Makefile.am b/gst/aiffparse/Makefile.am
deleted file mode 100644
index 23ace5f66..000000000
--- a/gst/aiffparse/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-plugin_LTLIBRARIES = libgstaiffparse.la
-
-libgstaiffparse_la_SOURCES = aiffparse.c
-libgstaiffparse_la_CFLAGS = \
- $(GST_BASE_CFLAGS) \
- $(GST_PLUGINS_BASE_CFLAGS) \
- $(GST_CFLAGS)
-libgstaiffparse_la_LIBADD = \
- $(GST_PLUGINS_BASE_LIBS) \
- $(GST_BASE_LIBS) \
- $(LIBM)
-libgstaiffparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstaiffparse_la_LIBTOOLFLAGS = --tag=disable-static
-
-noinst_HEADERS = aiffparse.h
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1cccb4e2f..696a9e90b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,7 +2,7 @@ ext/resindvd/resindvdsrc.c
ext/resindvd/rsnbasesrc.c
ext/sndfile/gstsfsink.c
ext/sndfile/gstsfsrc.c
-gst/aiffparse/aiffparse.c
+gst/aiff/aiffparse.c
gst/nuvdemux/gstnuvdemux.c
sys/dvb/gstdvbsrc.c
sys/oss4/oss4-mixer.c