Merge branch 'master' of git://anongit.freedesktop.org/gstreamer/gst-plugins-bad into fdo

6 files changed, 67 insertions, 17 deletions

diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index 03b2e71c..2bda68f2 100644
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -124,6 +124,7 @@ EXTRA_HFILES = \
 	$(top_srcdir)/gst/dccp/gstdccpserversink.h \
 	$(top_srcdir)/gst/dccp/gstdccpserversrc.h \
 	$(top_srcdir)/gst/debugutils/fpsdisplaysink.h \
+	$(top_srcdir)/gst/debugutils/gstcapssetter.h \
 	$(top_srcdir)/gst/dtmf/gstdtmfsrc.h \
 	$(top_srcdir)/gst/dtmf/gstrtpdtmfsrc.h \
 	$(top_srcdir)/gst/dtmf/gstrtpdtmfdepay.h \
@@ -137,7 +138,6 @@ EXTRA_HFILES = \
 	$(top_srcdir)/gst/rawparse/gstaudioparse.h \
 	$(top_srcdir)/gst/rawparse/gstvideoparse.h \
 	$(top_srcdir)/gst/rtpmanager/gstrtpbin.h \
-	$(top_srcdir)/gst/rtpmanager/gstrtpclient.h \
 	$(top_srcdir)/gst/rtpmanager/gstrtpjitterbuffer.h \
 	$(top_srcdir)/gst/rtpmanager/gstrtpptdemux.h \
 	$(top_srcdir)/gst/rtpmanager/gstrtpsession.h \
diff --git a/docs/plugins/gst-plugins-bad-plugins-docs.sgml b/docs/plugins/gst-plugins-bad-plugins-docs.sgml
index 959c9cb1..21ac6101 100644
--- a/docs/plugins/gst-plugins-bad-plugins-docs.sgml
+++ b/docs/plugins/gst-plugins-bad-plugins-docs.sgml
@@ -25,6 +25,7 @@
     <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" />
     <xi:include href="xml/element-celtdec.xml" />
     <xi:include href="xml/element-celtenc.xml" />
     <!--xi:include href="xml/element-dc1394.xml" /-->
@@ -41,7 +42,6 @@
     <xi:include href="xml/element-festival.xml" />
     <xi:include href="xml/element-fpsdisplaysink.xml" />
     <xi:include href="xml/element-gstrtpbin.xml" />
-    <xi:include href="xml/element-gstrtpclient.xml" />
     <xi:include href="xml/element-gstrtpjitterbuffer.xml" />
     <xi:include href="xml/element-gstrtpptdemux.xml" />
     <xi:include href="xml/element-gstrtpsession.xml" />
diff --git a/docs/plugins/gst-plugins-bad-plugins-sections.txt b/docs/plugins/gst-plugins-bad-plugins-sections.txt
index 70afb729..e5742a85 100644
--- a/docs/plugins/gst-plugins-bad-plugins-sections.txt
+++ b/docs/plugins/gst-plugins-bad-plugins-sections.txt
@@ -112,6 +112,20 @@ gst_camerabin_get_type
 </SECTION>
 
 <SECTION>
+<FILE>element-capssetter</FILE>
+<TITLE>capssetter</TITLE>
+GstCapsSetter
+<SUBSECTION Standard>
+GstCapsSetterClass
+GST_TYPE_CAPS_SETTER
+GST_CAPS_SETTER
+GST_IS_CAPS_SETTER
+GST_CAPS_SETTER_CLASS
+GST_IS_CAPS_SETTER_CLASS
+gst_caps_setter_get_type
+</SECTION>
+
+<SECTION>
 <FILE>element-celtdec</FILE>
 <TITLE>celtdec</TITLE>
 GstCeltDec
@@ -717,21 +731,6 @@ GST_IS_RTP_BIN_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>element-gstrtpclient</FILE>
-<TITLE>gstrtpclient</TITLE>
-GstRtpClient
-<SUBSECTION Standard>
-GstRtpClientClass
-GstRtpClientPrivate
-GST_RTP_CLIENT
-GST_IS_RTP_CLIENT
-GST_TYPE_RTP_CLIENT
-gst_rtp_client_get_type
-GST_RTP_CLIENT_CLASS
-GST_IS_RTP_CLIENT_CLASS
-</SECTION>
-
-<SECTION>
 <FILE>element-gstrtpjitterbuffer</FILE>
 <TITLE>gstrtpjitterbuffer</TITLE>
 GstRtpJitterBuffer
diff --git a/docs/plugins/gst-plugins-bad-plugins.args b/docs/plugins/gst-plugins-bad-plugins.args
index b13244f2..82bcfd30 100644
--- a/docs/plugins/gst-plugins-bad-plugins.args
+++ b/docs/plugins/gst-plugins-bad-plugins.args
@@ -23503,3 +23503,32 @@
 <DEFAULT>TRUE</DEFAULT>
 </ARG>
 
+<ARG>
+<NAME>GstCapsSetter::caps</NAME>
+<TYPE>GstCaps*</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Merge caps</NICK>
+<BLURB>Merge these caps (thereby overwriting) in the stream.</BLURB>
+<DEFAULT></DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>GstCapsSetter::join</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Join</NICK>
+<BLURB>Match incoming caps' mime-type to mime-type of provided caps.</BLURB>
+<DEFAULT>TRUE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>GstCapsSetter::replace</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Replace</NICK>
+<BLURB>Drop fields of incoming caps.</BLURB>
+<DEFAULT>FALSE</DEFAULT>
+</ARG>
diff --git a/docs/plugins/gst-plugins-bad-plugins.hierarchy b/docs/plugins/gst-plugins-bad-plugins.hierarchy
index a1204ca6..daf967df 100644
--- a/docs/plugins/gst-plugins-bad-plugins.hierarchy
+++ b/docs/plugins/gst-plugins-bad-plugins.hierarchy
@@ -76,6 +76,7 @@ GObject
           GstVideoMark
         GstIIR
         GstLegacyresample
+        GstCapsSetter
       GstSignalProcessor
         ladspa-noise-white
         ladspa-delay-5s
diff --git a/docs/plugins/inspect/plugin-debugutilsbad.xml b/docs/plugins/inspect/plugin-debugutilsbad.xml
index 0aabef1a..ff6d4b92 100644
--- a/docs/plugins/inspect/plugin-debugutilsbad.xml
+++ b/docs/plugins/inspect/plugin-debugutilsbad.xml
@@ -10,6 +10,27 @@
   <origin>Unknown package origin</origin>
   <elements>
     <element>
+      <name>capssetter</name>
+      <longname>CapsSetter</longname>
+      <class>Generic</class>
+      <description>Set/merge caps on stream</description>
+      <author>Mark Nauwelaerts &lt;mnauw@users.sourceforge.net&gt;</author>
+      <pads>
+        <caps>
+          <name>src</name>
+          <direction>source</direction>
+          <presence>always</presence>
+          <details>ANY</details>
+        </caps>
+        <caps>
+          <name>sink</name>
+          <direction>sink</direction>
+          <presence>always</presence>
+          <details>ANY</details>
+        </caps>
+      </pads>
+    </element>
+    <element>
       <name>fpsdisplaysink</name>
       <longname>Measure and show framerate on videosink</longname>
       <class>Sink/Video</class>