From: Tim-Philipp Müller <tim@centricular.net>
Date: Mon, 20 Aug 2012 22:30:38 +0000 (+0100)
Subject: video/x-dvd-subpicture -> subpicture/x-dvd
X-Git-Tag: 1.19.3~509^2~6773
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bce47066caa4cca0fb467ea6012ddb8957e486f0;p=platform%2Fupstream%2Fgstreamer.git

video/x-dvd-subpicture -> subpicture/x-dvd
---

diff --git a/docs/plugins/inspect/plugin-matroska.xml b/docs/plugins/inspect/plugin-matroska.xml
index 8df9c50..f623626 100644
--- a/docs/plugins/inspect/plugin-matroska.xml
+++ b/docs/plugins/inspect/plugin-matroska.xml
@@ -32,7 +32,7 @@
           <name>subtitle_%u</name>
           <direction>source</direction>
           <presence>sometimes</presence>
-          <details>text/x-pango-markup; application/x-ssa; application/x-ass; application/x-usf; video/x-dvd-subpicture; subpicture/x-pgs; subtitle/x-kate; application/x-subtitle-unknown</details>
+          <details>text/x-pango-markup; application/x-ssa; application/x-ass; application/x-usf; subpicture/x-dvd; subpicture/x-pgs; subtitle/x-kate; application/x-subtitle-unknown</details>
         </caps>
         <caps>
           <name>video_%u</name>
@@ -59,7 +59,7 @@
           <name>subtitle_%d</name>
           <direction>sink</direction>
           <presence>request</presence>
-          <details>subtitle/x-kate; text/plain; application/x-ssa; application/x-ass; application/x-usf; video/x-dvd-subpicture; application/x-subtitle-unknown</details>
+          <details>subtitle/x-kate; text/plain; application/x-ssa; application/x-ass; application/x-usf; subpicture/x-dvd; application/x-subtitle-unknown</details>
         </caps>
         <caps>
           <name>video_%u</name>
@@ -113,7 +113,7 @@
           <name>subtitle_%d</name>
           <direction>sink</direction>
           <presence>request</presence>
-          <details>subtitle/x-kate; text/plain; application/x-ssa; application/x-ass; application/x-usf; video/x-dvd-subpicture; application/x-subtitle-unknown</details>
+          <details>subtitle/x-kate; text/plain; application/x-ssa; application/x-ass; application/x-usf; subpicture/x-dvd; application/x-subtitle-unknown</details>
         </caps>
         <caps>
           <name>video_%u</name>
diff --git a/gst/isomp4/qtdemux.c b/gst/isomp4/qtdemux.c
index 89f8055..49c8c47 100644
--- a/gst/isomp4/qtdemux.c
+++ b/gst/isomp4/qtdemux.c
@@ -9749,7 +9749,7 @@ qtdemux_sub_caps (GstQTDemux * qtdemux, QtDemuxStream * stream,
   switch (fourcc) {
     case GST_MAKE_FOURCC ('m', 'p', '4', 's'):
       _codec ("DVD subtitle");
-      caps = gst_caps_new_empty_simple ("video/x-dvd-subpicture");
+      caps = gst_caps_new_empty_simple ("subpicture/x-dvd");
       break;
     case GST_MAKE_FOURCC ('t', 'e', 'x', 't'):
       _codec ("Quicktime timed text");
diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c
index 3683817..04cd76c 100644
--- a/gst/matroska/matroska-demux.c
+++ b/gst/matroska/matroska-demux.c
@@ -115,7 +115,7 @@ static GstStaticPadTemplate subtitle_src_templ =
     GST_PAD_SRC,
     GST_PAD_SOMETIMES,
     GST_STATIC_CAPS ("text/x-pango-markup; application/x-ssa; "
-        "application/x-ass;application/x-usf; video/x-dvd-subpicture; "
+        "application/x-ass;application/x-usf; subpicture/x-dvd; "
         "subpicture/x-pgs; subtitle/x-kate; " "application/x-subtitle-unknown")
     );
 
@@ -5643,7 +5643,7 @@ gst_matroska_demux_subtitle_caps (GstMatroskaTrackSubtitleContext *
     context->postprocess_frame = gst_matroska_demux_check_subtitle_buffer;
     subtitlecontext->check_markup = FALSE;
   } else if (!strcmp (codec_id, GST_MATROSKA_CODEC_ID_SUBTITLE_VOBSUB)) {
-    caps = gst_caps_new_empty_simple ("video/x-dvd-subpicture");
+    caps = gst_caps_new_empty_simple ("subpicture/x-dvd");
     ((GstMatroskaTrackContext *) subtitlecontext)->send_dvd_event = TRUE;
   } else if (!strcmp (codec_id, GST_MATROSKA_CODEC_ID_SUBTITLE_HDMVPGS)) {
     caps = gst_caps_new_empty_simple ("subpicture/x-pgs");
diff --git a/gst/matroska/matroska-mux.c b/gst/matroska/matroska-mux.c
index 1a60eeb..f7006bf 100644
--- a/gst/matroska/matroska-mux.c
+++ b/gst/matroska/matroska-mux.c
@@ -191,7 +191,7 @@ static GstStaticPadTemplate subtitlesink_templ =
     GST_PAD_REQUEST,
     GST_STATIC_CAPS ("subtitle/x-kate; "
         "text/plain; application/x-ssa; application/x-ass; "
-        "application/x-usf; video/x-dvd-subpicture; "
+        "application/x-usf; subpicture/x-dvd; "
         "application/x-subtitle-unknown")
     );
 
@@ -2023,7 +2023,7 @@ gst_matroska_mux_subtitle_pad_setcaps (GstPad * pad, GstCaps * caps)
     gst_matroska_mux_set_codec_id (context, GST_MATROSKA_CODEC_ID_SUBTITLE_ASS);
   } else if (!strcmp (mimetype, "application/x-usf")) {
     gst_matroska_mux_set_codec_id (context, GST_MATROSKA_CODEC_ID_SUBTITLE_USF);
-  } else if (!strcmp (mimetype, "video/x-dvd-subpicture")) {
+  } else if (!strcmp (mimetype, "subpicture/x-dvd")) {
     gst_matroska_mux_set_codec_id (context,
         GST_MATROSKA_CODEC_ID_SUBTITLE_VOBSUB);
   } else {