[gst-cvs] gst-plugins-bad: dvbsuboverlay: Rename DVB subtitling media type to subpicture/x-dvb

[<sl...@ke...>]

Module: gst-plugins-bad
Branch: master
Commit: a99e13cd5a9596137d6d8ba9d2974932f20c296c
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=a99e13cd5a9596137d6d8ba9d2974932f20c296c

Author: Sebastian Dröge <seb...@co...>
Date:   Wed Dec 15 21:11:29 2010 +0100

dvbsuboverlay: Rename DVB subtitling media type to subpicture/x-dvb

---

 gst/dvbsuboverlay/gstdvbsuboverlay.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gst/dvbsuboverlay/gstdvbsuboverlay.c b/gst/dvbsuboverlay/gstdvbsuboverlay.c
index b9a1d7c..6cf1d78 100644
--- a/gst/dvbsuboverlay/gstdvbsuboverlay.c
+++ b/gst/dvbsuboverlay/gstdvbsuboverlay.c
@@ -27,7 +27,7 @@
  * |[ FIXME
  * gst-launch -v filesrc location=/path/to/ts ! mpegtsdemux name=d ! queue ! mp3parse ! mad ! audioconvert ! autoaudiosink \
  *     d. ! queue ! mpeg2dec ! ffmpegcolorspace ! r. \
- *     d. ! queue ! "private/x-dvbsub" ! dvbsuboverlay name=r ! ffmpegcolorspace ! autovideosink
+ *     d. ! queue ! "subpicture/x-dvb" ! dvbsuboverlay name=r ! ffmpegcolorspace ! autovideosink
  * ]| This pipeline demuxes a MPEG-TS file with MPEG2 video, MP3 audio and embedded DVB subtitles and renders the subtitles on top of the video.
  * </refsect2>
  */
@@ -78,7 +78,7 @@ static GstStaticPadTemplate text_sink_factory =
 GST_STATIC_PAD_TEMPLATE ("text_sink",
     GST_PAD_SINK,
     GST_PAD_ALWAYS,
-    GST_STATIC_CAPS ("private/x-dvbsub")
+    GST_STATIC_CAPS ("subpicture/x-dvb")
     );
 
 static void gst_dvbsub_overlay_set_property (GObject * object, guint prop_id,
@@ -873,7 +873,7 @@ gst_dvbsub_overlay_chain_text (GstPad * pad, GstBuffer * buffer)
   GstDVBSubOverlay *overlay = GST_DVBSUB_OVERLAY (GST_PAD_PARENT (pad));
   GstClockTime sub_running_time;
 
-  GST_INFO_OBJECT (overlay, "private/x-dvbsub buffer with size %u",
+  GST_INFO_OBJECT (overlay, "subpicture/x-dvb buffer with size %u",
       GST_BUFFER_SIZE (buffer));
 
   GST_LOG_OBJECT (overlay,