Moved 'deinterlace2' from -bad to -good

And remove old deinterlace plugin as deinterlace2 will
be called deinterlace in -good.

5 files changed, 0 insertions, 102 deletions

diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index 08854e70..2bc11e09 100644
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -120,8 +120,6 @@ EXTRA_HFILES = \
 	$(top_srcdir)/gst/amrparse/gstamrparse.h \
 	$(top_srcdir)/gst/autoconvert/gstautoconvert.h \
 	$(top_srcdir)/gst/camerabin/gstcamerabin.h \
-	$(top_srcdir)/gst/deinterlace/gstdeinterlace.h \
-	$(top_srcdir)/gst/deinterlace2/gstdeinterlace2.h \
 	$(top_srcdir)/gst/dccp/gstdccpclientsink.h \
 	$(top_srcdir)/gst/dccp/gstdccpclientsrc.h \
 	$(top_srcdir)/gst/dccp/gstdccpserversink.h \
diff --git a/docs/plugins/gst-plugins-bad-plugins-docs.sgml b/docs/plugins/gst-plugins-bad-plugins-docs.sgml
index 2618a541..322ea414 100644
--- a/docs/plugins/gst-plugins-bad-plugins-docs.sgml
+++ b/docs/plugins/gst-plugins-bad-plugins-docs.sgml
@@ -32,8 +32,6 @@
     <xi:include href="xml/element-dccpclientsrc.xml" />
     <xi:include href="xml/element-dccpserversink.xml" />
     <xi:include href="xml/element-dccpserversrc.xml" />
-    <xi:include href="xml/element-deinterlace.xml" />
-    <xi:include href="xml/element-deinterlace2.xml" />
     <xi:include href="xml/element-dfbvideosink.xml" />
     <xi:include href="xml/element-dtmfsrc.xml" />
     <xi:include href="xml/element-dtsdec.xml" />
@@ -104,7 +102,6 @@
     <xi:include href="xml/plugin-celt.xml" />
     <xi:include href="xml/plugin-dccp.xml" />
     <xi:include href="xml/plugin-debugutilsbad.xml" />
-    <xi:include href="xml/plugin-deinterlace2.xml" />
     <xi:include href="xml/plugin-dfbvideosink.xml" />
     <xi:include href="xml/plugin-dirac.xml" />
     <xi:include href="xml/plugin-dtmf.xml" />
@@ -119,7 +116,6 @@
     <xi:include href="xml/plugin-filter.xml" />
     <xi:include href="xml/plugin-freeze.xml" />
     <xi:include href="xml/plugin-gsm.xml" />
-    <xi:include href="xml/plugin-gstinterlace.xml" />
     <xi:include href="xml/plugin-gstrtpmanager.xml" />
     <xi:include href="xml/plugin-h264parse.xml" />
     <xi:include href="xml/plugin-jack.xml" />
diff --git a/docs/plugins/gst-plugins-bad-plugins-sections.txt b/docs/plugins/gst-plugins-bad-plugins-sections.txt
index 382b9cc2..1b534ebe 100644
--- a/docs/plugins/gst-plugins-bad-plugins-sections.txt
+++ b/docs/plugins/gst-plugins-bad-plugins-sections.txt
@@ -210,34 +210,6 @@ gst_dccp_server_src_get_type
 </SECTION>
 
 <SECTION>
-<FILE>element-deinterlace</FILE>
-<TITLE>deinterlace</TITLE>
-GstDeinterlace
-<SUBSECTION Standard>
-GstDeinterlaceClass
-GST_DEINTERLACE
-GST_DEINTERLACE_CLASS
-GST_IS_DEINTERLACE
-GST_IS_DEINTERLACE_CLASS
-GST_TYPE_DEINTERLACE
-gst_deinterlace_get_type
-</SECTION>
-
-<SECTION>
-<FILE>element-deinterlace2</FILE>
-<TITLE>deinterlace2</TITLE>
-GstDeinterlace2
-<SUBSECTION Standard>
-GstDeinterlace2Class
-GST_IS_DEINTERLACE2
-GST_IS_DEINTERLACE2_CLASS
-GST_DEINTERLACE2
-GST_DEINTERLACE2_CLASS
-GST_TYPE_DEINTERLACE2
-gst_deinterlace2_get_type
-</SECTION>
-
-<SECTION>
 <FILE>element-dfbvideosink</FILE>
 <TITLE>dfbvideosink</TITLE>
 GstDfbVideoSink
diff --git a/docs/plugins/inspect/plugin-deinterlace2.xml b/docs/plugins/inspect/plugin-deinterlace2.xml
deleted file mode 100644
index 59e419a1..00000000
--- a/docs/plugins/inspect/plugin-deinterlace2.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<plugin>
-  <name>deinterlace2</name>
-  <description>Deinterlacer</description>
-  <filename>../../gst/deinterlace2/.libs/libgstdeinterlace2.so</filename>
-  <basename>libgstdeinterlace2.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>deinterlace2</name>
-      <longname>Deinterlacer</longname>
-      <class>Filter/Video</class>
-      <description>Deinterlace Methods ported from DScaler/TvTime</description>
-      <author>Martin Eikermann &lt;meiker@upb.de&gt;, Sebastian Dröge &lt;slomo@circular-chaos.org&gt;</author>
-      <pads>
-        <caps>
-          <name>sink</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>video/x-raw-yuv, format=(fourcc)YUY2, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-yuv, format=(fourcc)YVYU, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]</details>
-        </caps>
-        <caps>
-          <name>src</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>video/x-raw-yuv, format=(fourcc)YUY2, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw-yuv, format=(fourcc)YVYU, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]</details>
-        </caps>
-      </pads>
-    </element>
-  </elements>
-</plugin>
\ No newline at end of file
diff --git a/docs/plugins/inspect/plugin-gstinterlace.xml b/docs/plugins/inspect/plugin-gstinterlace.xml
deleted file mode 100644
index 14e0b2a0..00000000
--- a/docs/plugins/inspect/plugin-gstinterlace.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<plugin>
-  <name>gstinterlace</name>
-  <description>Deinterlace video</description>
-  <filename>../../gst/deinterlace/.libs/libgstdeinterlace.so</filename>
-  <basename>libgstdeinterlace.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>deinterlace</name>
-      <longname>Deinterlace</longname>
-      <class>Filter/Effect/Video</class>
-      <description>Deinterlace video</description>
-      <author>Wim Taymans &lt;wim.taymans@gmail.com&gt;</author>
-      <pads>
-        <caps>
-          <name>sink</name>
-          <direction>sink</direction>
-          <presence>always</presence>
-          <details>video/x-raw-yuv, format=(fourcc){ I420, Y42B }, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]</details>
-        </caps>
-        <caps>
-          <name>src</name>
-          <direction>source</direction>
-          <presence>always</presence>
-          <details>video/x-raw-yuv, format=(fourcc){ I420, Y42B }, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]</details>
-        </caps>
-      </pads>
-    </element>
-  </elements>
-</plugin>
\ No newline at end of file