From 05f3962c119d44e1a911d81a47297414086e84f8 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Fri, 7 Jul 2006 14:30:26 +0000 Subject: [PATCH] gst/qtdemux/qtdemux.c: Don't crash on twos/sowt/raw audio. #345830. Original commit message from CVS: * gst/qtdemux/qtdemux.c: (qtdemux_parse_trak): Don't crash on twos/sowt/raw audio. #345830. --- gst/qtdemux/qtdemux.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c index b2cbae3854..5dd0e0dcb2 100644 --- a/gst/qtdemux/qtdemux.c +++ b/gst/qtdemux/qtdemux.c @@ -3256,10 +3256,14 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak) GST_LOG ("bytes/frame: %d", stream->bytes_per_frame); GST_LOG ("bytes/sample: %d", stream->bytes_per_sample); - if (!stream->sampled) { - stream->samples_per_frame = (stream->bytes_per_frame / - stream->bytes_per_packet) * stream->samples_per_packet; - GST_LOG ("samples/frame: %d", stream->samples_per_frame); + if (fourcc != GST_MAKE_FOURCC ('t', 'w', 'o', 's') && + fourcc != GST_MAKE_FOURCC ('s', 'o', 'w', 't') && + fourcc != GST_MAKE_FOURCC ('r', 'a', 'w', ' ')) { + if (!stream->sampled) { + stream->samples_per_frame = (stream->bytes_per_frame / + stream->bytes_per_packet) * stream->samples_per_packet; + GST_LOG ("samples/frame: %d", stream->samples_per_frame); + } } offset = 68; } else if (version == 0x00020000) {