diff --git a/docs/plugins/inspect/plugin-dvdspu.xml b/docs/plugins/inspect/plugin-dvdspu.xml
index 27f47ea0e5..bc6dc844b4 100644
--- a/docs/plugins/inspect/plugin-dvdspu.xml
+++ b/docs/plugins/inspect/plugin-dvdspu.xml
@@ -20,7 +20,7 @@
subpicture
sink
always
- video/x-dvd-subpicture; subpicture/x-pgs
+ subpicture/x-dvd; subpicture/x-pgs
video
diff --git a/docs/plugins/inspect/plugin-kate.xml b/docs/plugins/inspect/plugin-kate.xml
index 288b52f5de..be78860233 100644
--- a/docs/plugins/inspect/plugin-kate.xml
+++ b/docs/plugins/inspect/plugin-kate.xml
@@ -26,7 +26,7 @@
src
source
always
- text/plain; text/x-pango-markup; video/x-dvd-subpicture
+ text/plain; text/x-pango-markup; subpicture/x-dvd
@@ -41,7 +41,7 @@
sink
sink
always
- text/plain; text/x-pango-markup; video/x-dvd-subpicture
+ text/plain; text/x-pango-markup; subpicture/x-dvd
src
diff --git a/docs/plugins/inspect/plugin-mpegdemux2.xml b/docs/plugins/inspect/plugin-mpegdemux2.xml
index 4e4c1eb5fb..1f403bfd11 100644
--- a/docs/plugins/inspect/plugin-mpegdemux2.xml
+++ b/docs/plugins/inspect/plugin-mpegdemux2.xml
@@ -38,7 +38,7 @@
subpicture_%02x
source
sometimes
- video/x-dvd-subpicture
+ subpicture/x-dvd
video_%02x
diff --git a/docs/plugins/inspect/plugin-mpegtsdemux.xml b/docs/plugins/inspect/plugin-mpegtsdemux.xml
index 32bcab649e..e7a6421f79 100644
--- a/docs/plugins/inspect/plugin-mpegtsdemux.xml
+++ b/docs/plugins/inspect/plugin-mpegtsdemux.xml
@@ -39,7 +39,7 @@ Edward Hervey <edward.hervey@collabora.co.uk>
subpicture_%04x
source
sometimes
- subpicture/x-pgs; video/x-dvd-subpicture
+ subpicture/x-pgs; subpicture/x-dvd
video_%04x
diff --git a/docs/plugins/inspect/plugin-resindvd.xml b/docs/plugins/inspect/plugin-resindvd.xml
index 61848db366..b48f79d982 100644
--- a/docs/plugins/inspect/plugin-resindvd.xml
+++ b/docs/plugins/inspect/plugin-resindvd.xml
@@ -26,7 +26,7 @@
subpicture
source
sometimes
- video/x-dvd-subpicture
+ subpicture/x-dvd
video
diff --git a/ext/kate/gstkateenc.c b/ext/kate/gstkateenc.c
index fb84c4c1ec..239bbb3d1e 100644
--- a/ext/kate/gstkateenc.c
+++ b/ext/kate/gstkateenc.c
@@ -527,7 +527,7 @@ gst_kate_enc_setcaps (GstPad * pad, GstCaps * caps)
GST_ELEMENT_WARNING (ke, LIBRARY, SETTINGS, (NULL),
("Category set to '%s', but input is text-based.", ke->category));
}
- } else if (gst_structure_has_name (s, "video/x-dvd-subpicture")) {
+ } else if (gst_structure_has_name (s, "subpicture/x-dvd")) {
if (strcmp (ke->category, "SUB") == 0 ||
strcmp (ke->category, "subtitles") == 0) {
GST_ELEMENT_WARNING (ke, LIBRARY, SETTINGS, (NULL),
diff --git a/ext/kate/gstkatespu.h b/ext/kate/gstkatespu.h
index b89e793421..f0c98944e6 100644
--- a/ext/kate/gstkatespu.h
+++ b/ext/kate/gstkatespu.h
@@ -33,7 +33,7 @@
#define GST_KATE_STM_TO_GST(stm) ((GST_MSECOND * 1024 * (stm)) / 90)
#define GST_KATE_GST_TO_STM(gst) ((int)(((gst) * 90000 ) / 1024))
-#define GST_KATE_SPU_MIME_TYPE "video/x-dvd-subpicture"
+#define GST_KATE_SPU_MIME_TYPE "subpicture/x-dvd"
G_BEGIN_DECLS
diff --git a/ext/kate/gstkateutil.c b/ext/kate/gstkateutil.c
index d4ca311258..a5eb838fc1 100644
--- a/ext/kate/gstkateutil.c
+++ b/ext/kate/gstkateutil.c
@@ -299,7 +299,7 @@ gst_kate_util_decoder_base_chain_kate_packet (GstKateDecoderBase * decoder,
}
if (strcmp (decoder->k.ki->category, "K-SPU") == 0 ||
strcmp (decoder->k.ki->category, "spu-subtitles") == 0) {
- *src_caps = gst_caps_new_empty_simple ("video/x-dvd-subpicture");
+ *src_caps = gst_caps_new_empty_simple ("subpicture/x-dvd");
} else if (decoder->k.ki->text_markup_type == kate_markup_none) {
*src_caps = gst_caps_new_empty_simple ("text/plain");
} else {
diff --git a/ext/resindvd/gstmpegdemux.c b/ext/resindvd/gstmpegdemux.c
index bfa8835088..527cd605af 100644
--- a/ext/resindvd/gstmpegdemux.c
+++ b/ext/resindvd/gstmpegdemux.c
@@ -89,7 +89,7 @@ static GstStaticPadTemplate subpicture_template =
GST_STATIC_PAD_TEMPLATE ("subpicture_%02x",
GST_PAD_SRC,
GST_PAD_SOMETIMES,
- GST_STATIC_CAPS ("video/x-dvd-subpicture")
+ GST_STATIC_CAPS ("subpicture/x-dvd")
);
static GstStaticPadTemplate private_template =
@@ -313,7 +313,7 @@ gst_flups_demux_create_stream (GstFluPSDemux * demux, gint id, gint stream_type)
case ST_PS_DVD_SUBPICTURE:
template = klass->subpicture_template;
name = g_strdup_printf ("subpicture_%02x", id);
- caps = gst_caps_new_simple ("video/x-dvd-subpicture", NULL);
+ caps = gst_caps_new_simple ("subpicture/x-dvd", NULL);
break;
case ST_GST_AUDIO_RAWA52:
template = klass->audio_template;
diff --git a/ext/resindvd/resindvdbin.c b/ext/resindvd/resindvdbin.c
index a83656d1e2..78a74e2bbe 100644
--- a/ext/resindvd/resindvdbin.c
+++ b/ext/resindvd/resindvdbin.c
@@ -76,7 +76,7 @@ static GstStaticPadTemplate subpicture_src_template =
GST_STATIC_PAD_TEMPLATE ("subpicture",
GST_PAD_SRC,
GST_PAD_SOMETIMES,
- GST_STATIC_CAPS ("video/x-dvd-subpicture")
+ GST_STATIC_CAPS ("subpicture/x-dvd")
);
static void rsn_dvdbin_do_init (GType rsn_dvdbin_type);
@@ -696,7 +696,7 @@ demux_pad_added (GstElement * element, GstPad * pad, RsnDvdBin * dvdbin)
if (can_sink_caps (dvdbin->pieces[DVD_ELEM_VIDDEC], caps)) {
dest_pad =
gst_element_get_static_pad (dvdbin->pieces[DVD_ELEM_VIDDEC], "sink");
- } else if (g_str_equal (gst_structure_get_name (s), "video/x-dvd-subpicture")) {
+ } else if (g_str_equal (gst_structure_get_name (s), "subpicture/x-dvd")) {
dest_pad =
gst_element_get_request_pad (dvdbin->pieces[DVD_ELEM_SPU_SELECT],
"sink_%u");
diff --git a/gst/dvdspu/gstdvdspu.c b/gst/dvdspu/gstdvdspu.c
index 2b253d3d25..5d7b526220 100644
--- a/gst/dvdspu/gstdvdspu.c
+++ b/gst/dvdspu/gstdvdspu.c
@@ -78,7 +78,7 @@ static GstStaticPadTemplate subpic_sink_factory =
GST_STATIC_PAD_TEMPLATE ("subpicture",
GST_PAD_SINK,
GST_PAD_ALWAYS,
- GST_STATIC_CAPS ("video/x-dvd-subpicture; subpicture/x-pgs")
+ GST_STATIC_CAPS ("subpicture/x-dvd; subpicture/x-pgs")
);
static const guint32 default_clut[16] = {
@@ -1156,7 +1156,7 @@ gst_dvd_spu_subpic_set_caps (GstPad * pad, GstCaps * caps)
s = gst_caps_get_structure (caps, 0);
- if (gst_structure_has_name (s, "video/x-dvd-subpicture")) {
+ if (gst_structure_has_name (s, "subpicture/x-dvd")) {
input_type = SPU_INPUT_TYPE_VOBSUB;
} else if (gst_structure_has_name (s, "subpicture/x-pgs")) {
input_type = SPU_INPUT_TYPE_PGS;
diff --git a/gst/mpegdemux/gstmpegdemux.c b/gst/mpegdemux/gstmpegdemux.c
index ee78c00a0c..723bd89cd5 100644
--- a/gst/mpegdemux/gstmpegdemux.c
+++ b/gst/mpegdemux/gstmpegdemux.c
@@ -128,7 +128,7 @@ static GstStaticPadTemplate subpicture_template =
GST_STATIC_PAD_TEMPLATE ("subpicture_%02x",
GST_PAD_SRC,
GST_PAD_SOMETIMES,
- GST_STATIC_CAPS ("video/x-dvd-subpicture")
+ GST_STATIC_CAPS ("subpicture/x-dvd")
);
static GstStaticPadTemplate private_template =
@@ -400,7 +400,7 @@ gst_flups_demux_create_stream (GstFluPSDemux * demux, gint id, gint stream_type)
case ST_PS_DVD_SUBPICTURE:
template = klass->subpicture_template;
name = g_strdup_printf ("subpicture_%02x", id);
- caps = gst_caps_new_empty_simple ("video/x-dvd-subpicture");
+ caps = gst_caps_new_empty_simple ("subpicture/x-dvd");
break;
case ST_GST_AUDIO_RAWA52:
template = klass->audio_template;
diff --git a/gst/mpegtsdemux/tsdemux.c b/gst/mpegtsdemux/tsdemux.c
index ebe6180790..17c1ef0f21 100644
--- a/gst/mpegtsdemux/tsdemux.c
+++ b/gst/mpegtsdemux/tsdemux.c
@@ -187,7 +187,7 @@ struct _TSDemuxStream
/* Can also use the subpicture pads for text subtitles? */
#define SUBPICTURE_CAPS \
- GST_STATIC_CAPS ("subpicture/x-pgs; video/x-dvd-subpicture")
+ GST_STATIC_CAPS ("subpicture/x-pgs; subpicture/x-dvd")
static GstStaticPadTemplate video_template =
GST_STATIC_PAD_TEMPLATE ("video_%04x", GST_PAD_SRC,
@@ -947,7 +947,7 @@ create_pad_for_stream (MpegTSBase * base, MpegTSBaseStream * bstream,
case ST_PS_DVD_SUBPICTURE:
template = gst_static_pad_template_get (&subpicture_template);
name = g_strdup_printf ("subpicture_%04x", bstream->pid);
- caps = gst_caps_new_empty_simple ("video/x-dvd-subpicture");
+ caps = gst_caps_new_empty_simple ("subpicture/x-dvd");
break;
case ST_BD_PGS_SUBPICTURE:
template = gst_static_pad_template_get (&subpicture_template);
diff --git a/tests/check/elements/kate.c b/tests/check/elements/kate.c
index c33c8f92f0..2ac860d8cb 100644
--- a/tests/check/elements/kate.c
+++ b/tests/check/elements/kate.c
@@ -514,7 +514,7 @@ GST_START_TEST (test_kate_encode_spu)
GST_BUFFER_DURATION (inbuffer) = 5 * GST_SECOND;
ASSERT_BUFFER_REFCOUNT (inbuffer, "inbuffer", 1);
- caps = gst_caps_from_string ("video/x-dvd-subpicture");
+ caps = gst_caps_from_string ("subpicture/x-dvd");
fail_unless (caps != NULL);
gst_buffer_set_caps (inbuffer, caps);
gst_caps_unref (caps);