Moved 'flv' from -bad to -good

5 files changed, 0 insertions, 142 deletions

diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index faa5e33c..08854e70 100644
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -132,8 +132,6 @@ EXTRA_HFILES = \
 	$(top_srcdir)/gst/dtmf/gstrtpdtmfdepay.h \
 	$(top_srcdir)/gst/dvdspu/gstdvdspu.h \
 	$(top_srcdir)/gst/festival/gstfestival.h \
-	$(top_srcdir)/gst/flv/gstflvdemux.h \
-	$(top_srcdir)/gst/flv/gstflvmux.h \
 	$(top_srcdir)/gst/legacyresample/gstlegacyresample.h \
 	$(top_srcdir)/gst/liveadder/liveadder.h \
 	$(top_srcdir)/gst/mxf/mxfdemux.h \
diff --git a/docs/plugins/gst-plugins-bad-plugins-docs.sgml b/docs/plugins/gst-plugins-bad-plugins-docs.sgml
index 2fc7166a..2618a541 100644
--- a/docs/plugins/gst-plugins-bad-plugins-docs.sgml
+++ b/docs/plugins/gst-plugins-bad-plugins-docs.sgml
@@ -40,8 +40,6 @@
     <xi:include href="xml/element-dvbsrc.xml" />
     <xi:include href="xml/element-dvdspu.xml" />
     <xi:include href="xml/element-festival.xml" />
-    <xi:include href="xml/element-flvdemux.xml" />
-    <xi:include href="xml/element-flvmux.xml" />
     <xi:include href="xml/element-fpsdisplaysink.xml" />
     <xi:include href="xml/element-gstrtpbin.xml" />
     <xi:include href="xml/element-gstrtpclient.xml" />
@@ -119,7 +117,6 @@
     <xi:include href="xml/plugin-fbdevsink.xml" />
     <xi:include href="xml/plugin-festival.xml" />
     <xi:include href="xml/plugin-filter.xml" />
-    <xi:include href="xml/plugin-flv.xml" />
     <xi:include href="xml/plugin-freeze.xml" />
     <xi:include href="xml/plugin-gsm.xml" />
     <xi:include href="xml/plugin-gstinterlace.xml" />
diff --git a/docs/plugins/gst-plugins-bad-plugins-sections.txt b/docs/plugins/gst-plugins-bad-plugins-sections.txt
index 1523e264..382b9cc2 100644
--- a/docs/plugins/gst-plugins-bad-plugins-sections.txt
+++ b/docs/plugins/gst-plugins-bad-plugins-sections.txt
@@ -357,36 +357,6 @@ FESTIVAL_DEFAULT_TEXT_MODE
 </SECTION>
 
 <SECTION>
-<FILE>element-flvdemux</FILE>
-<TITLE>flvdemux</TITLE>
-GstFLVDemux
-<SUBSECTION Standard>
-GstFLVDemuxClass
-GstFLVDemuxFlags
-GST_FLV_DEMUX
-GST_FLV_DEMUX_CLASS
-GST_IS_FLV_DEMUX
-GST_IS_FLV_DEMUX_CLASS
-GST_TYPE_FLV_DEMUX
-gst_flv_demux_get_type
-</SECTION>
-
-<SECTION>
-<FILE>element-flvmux</FILE>
-<TITLE>flvmux</TITLE>
-GstFlvMux
-<SUBSECTION Standard>
-GstFlvMuxClass
-GstFlvMuxFlags
-GST_FLV_MUX
-GST_FLV_MUX_CLASS
-GST_IS_FLV_MUX
-GST_IS_FLV_MUX_CLASS
-GST_TYPE_FLV_MUX
-gst_flv_mux_get_type
-</SECTION>
-
-<SECTION>
 <FILE>element-fpsdisplaysink</FILE>
 <TITLE>fpsdisplaysink</TITLE>
 GstFPSDisplaySink
diff --git a/docs/plugins/inspect/plugin-flv.xml b/docs/plugins/inspect/plugin-flv.xml
deleted file mode 100644
index 4007af6c..00000000
--- a/docs/plugins/inspect/plugin-flv.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<plugin>
-  <name>flv</name>
-  <description>FLV muxing and demuxing plugin</description>
-  <filename>../../gst/flv/.libs/libgstflv.so</filename>
-  <basename>libgstflv.so</basename>
-  <version>0.10.11.1</version>
-  <license>LGPL</license>
-  <source>gst-plugins-bad</source>
-  <package>GStreamer Bad Plug-ins CVS/prerelease</package>
-  <origin>Unknown package origin</origin>
-  <elements>
-    <element>
-      <name>flvdemux</name>
-      <longname>FLV Demuxer</longname>
-      <class>Codec/Demuxer</class>
-      <description>Demux FLV feeds into digital streams</description>
-      <author>Julien Moutte &lt;julien@moutte.net&gt;</author>
-      <pads>
-        <caps>
-          <name>video</name>
-          <direction>source</direction>
-          <presence>sometimes</presence>
-          <details>ANY</details>
-        </caps>
-        <caps>
-          <name>audio</name>
-          <direction>source</direction>
-          <presence>sometimes</presence>
-          <details>ANY</details>
-        </caps>
-        <caps>
-          <name>sink</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>video/x-flv</details>
-        </caps>
-      </pads>
-    </element>
-    <element>
-      <name>flvmux</name>
-      <longname>FLV muxer</longname>
-      <class>Codec/Muxer</class>
-      <description>Muxes video/audio streams into a FLV stream</description>
-      <author>Sebastian Dröge &lt;sebastian.droege@collabora.co.uk&gt;</author>
-      <pads>
-        <caps>
-          <name>src</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>video/x-flv</details>
-        </caps>
-        <caps>
-          <name>audio</name>
-          <direction>sink</direction>
-          <presence>request</presence>
-          <details>audio/x-adpcm, layout=(string)swf, channels=(int){ 1, 2 }, rate=(int){ 5512, 11025, 22050, 44100 }; audio/mpeg, mpegversion=(int)1, layer=(int)3, channels=(int){ 1, 2 }, rate=(int){ 5512, 8000, 11025, 22050, 44100 }; audio/mpeg, mpegversion=(int)4; audio/x-nellymoser, channels=(int){ 1, 2 }, rate=(int){ 5512, 8000, 11025, 16000, 22050, 44100 }; audio/x-raw-int, endianness=(int)1234, channels=(int){ 1, 2 }, width=(int)8, depth=(int)8, rate=(int){ 5512, 11025, 22050, 44100 }, signed=(boolean)false; audio/x-raw-int, endianness=(int)1234, channels=(int){ 1, 2 }, width=(int)16, depth=(int)16, rate=(int){ 5512, 11025, 22050, 44100 }, signed=(boolean)true; audio/x-alaw, channels=(int){ 1, 2 }, rate=(int){ 5512, 11025, 22050, 44100 }; audio/x-mulaw, channels=(int){ 1, 2 }, rate=(int){ 5512, 11025, 22050, 44100 }; audio/x-speex, channels=(int){ 1, 2 }, rate=(int){ 5512, 11025, 22050, 44100 }</details>
-        </caps>
-        <caps>
-          <name>video</name>
-          <direction>sink</direction>
-          <presence>request</presence>
-          <details>video/x-flash-video; video/x-flash-screen; video/x-vp6-flash; video/x-vp6-alpha; video/x-h264</details>
-        </caps>
-      </pads>
-    </element>
-  </elements>
-</plugin>
\ No newline at end of file
diff --git a/docs/plugins/inspect/plugin-flvdemux.xml b/docs/plugins/inspect/plugin-flvdemux.xml
deleted file mode 100644
index 38efba36..00000000
--- a/docs/plugins/inspect/plugin-flvdemux.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<plugin>
-  <name>flvdemux</name>
-  <description>Element demuxing FLV stream</description>
-  <filename>../../gst/flv/.libs/libgstflvdemux.so</filename>
-  <basename>libgstflvdemux.so</basename>
-  <version>0.10.8</version>
-  <license>LGPL</license>
-  <source>gst-plugins-bad</source>
-  <package>GStreamer Bad Plug-ins source release</package>
-  <origin>Unknown package origin</origin>
-  <elements>
-    <element>
-      <name>flvdemux</name>
-      <longname>FLV Demuxer</longname>
-      <class>Codec/Demuxer</class>
-      <description>Demux FLV feeds into digital streams</description>
-      <author>Julien Moutte &lt;julien@moutte.net&gt;</author>
-      <pads>
-        <caps>
-          <name>sink</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>video/x-flv</details>
-        </caps>
-        <caps>
-          <name>audio</name>
-          <direction>source</direction>
-          <presence>sometimes</presence>
-          <details>ANY</details>
-        </caps>
-        <caps>
-          <name>video</name>
-          <direction>source</direction>
-          <presence>sometimes</presence>
-          <details>ANY</details>
-        </caps>
-      </pads>
-    </element>
-  </elements>
-</plugin>
\ No newline at end of file