mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-23 10:11:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Tim-Philipp Müller 2012-08-20 23:30:38 +01:00
parent 6ee9a7d228
commit bce47066ca
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
docs/plugins/inspect/plugin-matroska.xml
View file

@ -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>

2
gst/isomp4/qtdemux.c
View file

@ -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");

4
gst/matroska/matroska-demux.c
View file

@ -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");

4
gst/matroska/matroska-mux.c
View file

@ -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 {