[gst-cvs] gst-plugins-good: qtdemux: also consider Quicktime text subtitles

[Mark Nauwelaerts]

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

Author: Mark Nauwelaerts <mark.nauwelaerts at collabora.co.uk>
Date:   Fri Oct  9 17:12:46 2009 +0200

qtdemux: also consider Quicktime text subtitles

---

 gst/qtdemux/qtdemux.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c
index e79c49f..2246b59 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;