Merge branch 'fdo' into lv2

5 files changed, 36 insertions, 111 deletions

diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index 0a43f4ca..7ac083ae 100644
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -89,9 +89,7 @@ EXAMPLE_CFILES = \
         $(top_srcdir)/ext/directfb/dfb-example.c
 
 EXTRA_HFILES = \
-	$(top_srcdir)/ext/amrwb/gstamrwbdec.h \
-	$(top_srcdir)/ext/amrwb/gstamrwbenc.h \
-	$(top_srcdir)/ext/amrwb/gstamrwbparse.h \
+	$(top_srcdir)/ext/amrwbenc/gstamrwbenc.h \
 	$(top_srcdir)/ext/celt/gstceltdec.h \
 	$(top_srcdir)/ext/celt/gstceltenc.h \
 	$(top_srcdir)/ext/dc1394/gstdc1394.h \
diff --git a/docs/plugins/gst-plugins-bad-plugins-docs.sgml b/docs/plugins/gst-plugins-bad-plugins-docs.sgml
index f1a36d70..ef8eb36b 100644
--- a/docs/plugins/gst-plugins-bad-plugins-docs.sgml
+++ b/docs/plugins/gst-plugins-bad-plugins-docs.sgml
@@ -19,10 +19,7 @@
     <title>gst-plugins-bad Elements</title>
     <xi:include href="xml/element-aacparse.xml" />
     <xi:include href="xml/element-amrparse.xml" />
-    <xi:include href="xml/element-amrwbdec.xml" />
     <xi:include href="xml/element-amrwbenc.xml" />
-    <xi:include href="xml/element-amrwbparse.xml" />
-    <xi:include href="xml/element-amrwbparse.xml" />
     <xi:include href="xml/element-autoconvert.xml" />
     <xi:include href="xml/element-camerabin.xml" />
     <xi:include href="xml/element-capssetter.xml" />
@@ -100,7 +97,7 @@
     <xi:include href="xml/plugin-autoconvert.xml" />
     <xi:include href="xml/plugin-legacyresample.xml" />
     <xi:include href="xml/plugin-alsaspdif.xml" />
-    <xi:include href="xml/plugin-amrwb.xml" />
+    <xi:include href="xml/plugin-amrwbenc.xml" />
     <xi:include href="xml/plugin-bayer.xml" />
     <xi:include href="xml/plugin-bz2.xml" />
     <xi:include href="xml/plugin-camerabin.xml" />
diff --git a/docs/plugins/gst-plugins-bad-plugins-sections.txt b/docs/plugins/gst-plugins-bad-plugins-sections.txt
index 09e0e3fc..c60e127c 100644
--- a/docs/plugins/gst-plugins-bad-plugins-sections.txt
+++ b/docs/plugins/gst-plugins-bad-plugins-sections.txt
@@ -27,20 +27,6 @@ gst_amrparse_get_type
 </SECTION>
 
 <SECTION>
-<FILE>element-amrwbdec</FILE>
-<TITLE>amrwbdec</TITLE>
-GstAmrwbDec
-<SUBSECTION Standard>
-GstAmrwbDecClass
-GST_AMRWBDEC
-GST_AMRWBDEC_CLASS
-GST_IS_AMRWBDEC
-GST_IS_AMRWBDEC_CLASS
-GST_TYPE_AMRWBDEC
-gst_amrwbdec_get_type
-</SECTION>
-
-<SECTION>
 <FILE>element-amrwbenc</FILE>
 <TITLE>amrwbenc</TITLE>
 GstAmrwbEnc
@@ -55,20 +41,6 @@ gst_amrwbenc_get_type
 </SECTION>
 
 <SECTION>
-<FILE>element-amrwbparse</FILE>
-<TITLE>amrwbparse</TITLE>
-GstAmrwbParse
-<SUBSECTION Standard>
-GstAmrwbParseClass
-GST_AMRWBPARSE
-GST_AMRWBPARSE_CLASS
-GST_IS_AMRWBPARSE
-GST_IS_AMRWBPARSE_CLASS
-GST_TYPE_AMRWBPARSE
-gst_amrwbparse_get_type
-</SECTION>
-
-<SECTION>
 <FILE>element-audioparse</FILE>
 <TITLE>audioparse</TITLE>
 GstAudioParse
diff --git a/docs/plugins/inspect/plugin-amrwb.xml b/docs/plugins/inspect/plugin-amrwb.xml
deleted file mode 100644
index bd617351..00000000
--- a/docs/plugins/inspect/plugin-amrwb.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<plugin>
-  <name>amrwb</name>
-  <description>Adaptive Multi-Rate Wide-Band</description>
-  <filename>../../ext/amrwb/.libs/libgstamrwb.so</filename>
-  <basename>libgstamrwb.so</basename>
-  <version>0.10.13.1</version>
-  <license>unknown</license>
-  <source>gst-plugins-bad</source>
-  <package>GStreamer Bad Plug-ins git/prerelease</package>
-  <origin>http://gstreamer.freedesktop.org</origin>
-  <elements>
-    <element>
-      <name>amrwbdec</name>
-      <longname>AMR-WB audio decoder</longname>
-      <class>Codec/Decoder/Audio</class>
-      <description>Adaptive Multi-Rate Wideband audio decoder</description>
-      <author>Renato Araujo &lt;renato.filho@indt.org.br&gt;</author>
-      <pads>
-        <caps>
-          <name>src</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-int, width=(int)16, depth=(int)16, signed=(boolean)true, endianness=(int)1234, rate=(int)16000, channels=(int)1</details>
-        </caps>
-        <caps>
-          <name>sink</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/AMR-WB, rate=(int)16000, channels=(int)1</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>amrwbenc</name>
-      <longname>AMR-WB audio encoder</longname>
-      <class>Codec/Encoder/Audio</class>
-      <description>Adaptive Multi-Rate Wideband audio encoder</description>
-      <author>Renato Araujo &lt;renato.filho@indt.org.br&gt;</author>
-      <pads>
-        <caps>
-          <name>src</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/AMR-WB, rate=(int)16000, channels=(int)1</details>
-        </caps>
-        <caps>
-          <name>sink</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-raw-int, width=(int)16, depth=(int)16, signed=(boolean)true, endianness=(int)1234, rate=(int)16000, channels=(int)1</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>amrwbparse</name>
-      <longname>AMR-WB audio stream parser</longname>
-      <class>Codec/Parser/Audio</class>
-      <description>Adaptive Multi-Rate WideBand audio parser</description>
-      <author>Renato Filho &lt;renato.filho@indt.org.br&gt;</author>
-      <pads>
-        <caps>
-          <name>src</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>audio/AMR-WB, rate=(int)16000, channels=(int)1</details>
-        </caps>
-        <caps>
-          <name>sink</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>audio/x-amr-wb-sh</details>
-        </caps>
-      </pads>
-    </element>
-  </elements>
-</plugin>
\ No newline at end of file
diff --git a/docs/plugins/inspect/plugin-amrwbenc.xml b/docs/plugins/inspect/plugin-amrwbenc.xml
new file mode 100644
index 00000000..9a7ada08
--- /dev/null
+++ b/docs/plugins/inspect/plugin-amrwbenc.xml
@@ -0,0 +1,34 @@
+<plugin>
+  <name>amrwbenc</name>
+  <description>Adaptive Multi-Rate Wide-Band Encoder</description>
+  <filename>../../ext/amrwb/.libs/libgstamrwbenc.so</filename>
+  <basename>libgstamrwbenc.so</basename>
+  <version>0.10.12.1</version>
+  <license>unknown</license>
+  <source>gst-plugins-bad</source>
+  <package>GStreamer Bad Plug-ins git/prerelease</package>
+  <origin>Unknown package origin</origin>
+  <elements>
+    <element>
+      <name>amrwbenc</name>
+      <longname>AMR-WB audio encoder</longname>
+      <class>Codec/Encoder/Audio</class>
+      <description>Adaptive Multi-Rate Wideband audio encoder</description>
+      <author>Renato Araujo &lt;renato.filho@indt.org.br&gt;</author>
+      <pads>
+        <caps>
+          <name>src</name>
+          <direction>source</direction>
+          <presence>always</presence>
+          <details>audio/AMR-WB, rate=(int)16000, channels=(int)1</details>
+        </caps>
+        <caps>
+          <name>sink</name>
+          <direction>sink</direction>
+          <presence>always</presence>
+          <details>audio/x-raw-int, width=(int)16, depth=(int)16, signed=(boolean)true, endianness=(int)1234, rate=(int)16000, channels=(int)1</details>
+        </caps>
+      </pads>
+    </element>
+  </elements>
+</plugin>