summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>2009-10-09 17:12:46 +0200
committerMark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>2009-10-09 17:49:20 +0200
commit6f34e2b0db8311281745554403a26c6b175f398d (patch)
treea32b6a33210c2e92b51d20460f61ca726305b826
parent955a719c1a9a340f22351bd5a0187ab4361a0799 (diff)
qtdemux: also consider Quicktime text subtitles
-rw-r--r--gst/qtdemux/qtdemux.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c
index e79c49f4..2246b594 100644
--- a/gst/qtdemux/qtdemux.c
+++ b/gst/qtdemux/qtdemux.c
@@ -2253,7 +2253,7 @@ gst_qtdemux_process_buffer (GstQTDemux * qtdemux, QtDemuxStream * stream,
stream->need_process = FALSE;
}
- if (G_UNLIKELY (stream->fourcc != FOURCC_tx3g)) {
+ if (G_UNLIKELY (stream->subtype != FOURCC_text)) {
return buf;
}
@@ -6539,8 +6539,12 @@ qtdemux_sub_caps (GstQTDemux * qtdemux, QtDemuxStream * stream,
_codec ("DVD subtitle");
caps = gst_caps_new_simple ("video/x-dvd-subpicture", NULL);
break;
+ case GST_MAKE_FOURCC ('t', 'e', 'x', 't'):
+ _codec ("Quicktime timed text");
+ goto text;
case GST_MAKE_FOURCC ('t', 'x', '3', 'g'):
_codec ("3GPP timed text");
+ text:
caps = gst_caps_new_simple ("text/plain", NULL);
/* actual text piece needs to be extracted */
stream->need_process = TRUE;