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.
This commit is contained in:
parent
4af71bd569
commit
2c601a7a19
@ -1,3 +1,8 @@
|
|||||||
|
2006-07-07 Wim Taymans <wim@fluendo.com>
|
||||||
|
|
||||||
|
* gst/qtdemux/qtdemux.c: (qtdemux_parse_trak):
|
||||||
|
Don't crash on twos/sowt/raw audio. #345830.
|
||||||
|
|
||||||
2006-07-07 Wim Taymans <wim@fluendo.com>
|
2006-07-07 Wim Taymans <wim@fluendo.com>
|
||||||
|
|
||||||
Patch by: Lutz Mueller <lutz at topfrose dot de>
|
Patch by: Lutz Mueller <lutz at topfrose dot de>
|
||||||
|
@ -3256,11 +3256,15 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak)
|
|||||||
GST_LOG ("bytes/frame: %d", stream->bytes_per_frame);
|
GST_LOG ("bytes/frame: %d", stream->bytes_per_frame);
|
||||||
GST_LOG ("bytes/sample: %d", stream->bytes_per_sample);
|
GST_LOG ("bytes/sample: %d", stream->bytes_per_sample);
|
||||||
|
|
||||||
|
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) {
|
if (!stream->sampled) {
|
||||||
stream->samples_per_frame = (stream->bytes_per_frame /
|
stream->samples_per_frame = (stream->bytes_per_frame /
|
||||||
stream->bytes_per_packet) * stream->samples_per_packet;
|
stream->bytes_per_packet) * stream->samples_per_packet;
|
||||||
GST_LOG ("samples/frame: %d", stream->samples_per_frame);
|
GST_LOG ("samples/frame: %d", stream->samples_per_frame);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
offset = 68;
|
offset = 68;
|
||||||
} else if (version == 0x00020000) {
|
} else if (version == 0x00020000) {
|
||||||
union
|
union
|
||||||
|
Loading…
x
Reference in New Issue
Block a user