diff options
| author | j^ <j@bootlab.org> | 2006-04-20 09:48:05 +0000 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@gmail.com> | 2006-04-20 09:48:05 +0000 |
| commit | 67ac819e293a09aa54510c20b5b00d5f5f4bb2cf (patch) | |
| tree | db0ec042e6c4af416e5be11b5a1af539f4cca5d9 | |
| parent | fe9349fa030905fc6b02aef152771ae4a25db036 (diff) | |
| download | gst-plugins-bad-67ac819e293a09aa54510c20b5b00d5f5f4bb2cf.tar.gz gst-plugins-bad-67ac819e293a09aa54510c20b5b00d5f5f4bb2cf.tar.bz2 gst-plugins-bad-67ac819e293a09aa54510c20b5b00d5f5f4bb2cf.zip | |
gst/qtdemux/qtdemux.c: Never treat video streams as an audio stream.
Original commit message from CVS:
Patch by: j^ <j at bootlab dot org>
* gst/qtdemux/qtdemux.c: (qtdemux_parse_trak),
(qtdemux_video_caps):
Never treat video streams as an audio stream.
Add qtdrw mime type.
Fixes #339041
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | gst/qtdemux/qtdemux.c | 9 |
2 files changed, 17 insertions, 2 deletions
@@ -1,3 +1,13 @@ +2006-04-20 Wim Taymans <wim@fluendo.com> + + Patch by: j^ <j at bootlab dot org> + + * gst/qtdemux/qtdemux.c: (qtdemux_parse_trak), + (qtdemux_video_caps): + Never treat video streams as an audio stream. + Add qtdrw mime type. + Fixes #339041 + 2006-04-19 Wim Taymans <wim@fluendo.com> * gst/qtdemux/qtdemux.c: (qtdemux_parse_trak): diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c index 07d426b9..339466a7 100644 --- a/gst/qtdemux/qtdemux.c +++ b/gst/qtdemux/qtdemux.c @@ -3013,10 +3013,10 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak) GST_LOG ("track type: %" GST_FOURCC_FORMAT, GST_FOURCC_ARGS (QTDEMUX_FOURCC_GET (hdlr->data + 12))); - GST_LOG ("track subtype: %" GST_FOURCC_FORMAT, - GST_FOURCC_ARGS (QTDEMUX_FOURCC_GET (hdlr->data + 16))); stream->subtype = QTDEMUX_FOURCC_GET (hdlr->data + 16); + GST_LOG ("track subtype: %" GST_FOURCC_FORMAT, + GST_FOURCC_ARGS (stream->subtype)); minf = qtdemux_tree_get_child_by_type (mdia, FOURCC_minf); g_assert (minf); @@ -3030,6 +3030,8 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak) if (stream->subtype == FOURCC_vide) { guint32 fourcc; + stream->sampled = TRUE; + offset = 16; GST_LOG ("st type: %" GST_FOURCC_FORMAT, GST_FOURCC_ARGS (QTDEMUX_FOURCC_GET (stsd->data + offset + 4))); @@ -3929,6 +3931,9 @@ qtdemux_video_caps (GstQTDemux * qtdemux, guint32 fourcc, case GST_MAKE_FOURCC ('c', 'v', 'i', 'd'): _codec ("Cinepak"); return gst_caps_from_string ("video/x-cinepak"); + case GST_MAKE_FOURCC ('q', 'd', 'r', 'w'): + _codec ("Apple QuickDraw"); + return gst_caps_from_string ("video/x-qdrw"); case GST_MAKE_FOURCC ('r', 'p', 'z', 'a'): _codec ("Apple video"); return gst_caps_from_string ("video/x-apple-video"); |