mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-27 12:11:13 +00:00
gst/qtdemux/qtdemux.c: Don't crash by dividing by zero (see sample movie in #126922).
Original commit message from CVS: * gst/qtdemux/qtdemux.c: (gst_qtdemux_add_stream), (qtdemux_parse_trak): Don't crash by dividing by zero (see sample movie in #126922).
This commit is contained in:
parent
fe20ee4218
commit
84f449bd4b
2 changed files with 14 additions and 4 deletions
|
@ -1,3 +1,9 @@
|
|||
2004-09-13 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
|
||||
|
||||
* gst/qtdemux/qtdemux.c: (gst_qtdemux_add_stream),
|
||||
(qtdemux_parse_trak):
|
||||
Don't crash by dividing by zero (see sample movie in #126922).
|
||||
|
||||
2004-09-13 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
|
||||
|
||||
* gst/qtdemux/qtdemux.c: (qtdemux_audio_caps):
|
||||
|
|
|
@ -850,7 +850,8 @@ gst_qtdemux_add_stream (GstQTDemux * qtdemux, QtDemuxStream * stream)
|
|||
g_print ("setting caps %s\n", gst_caps_to_string (stream->caps));
|
||||
gst_pad_set_explicit_caps (stream->pad, stream->caps);
|
||||
|
||||
GST_DEBUG ("adding pad %p to qtdemux %p", stream->pad, qtdemux);
|
||||
GST_DEBUG ("adding pad %s %p to qtdemux %p",
|
||||
gst_pad_get_name (stream->pad), stream->pad, qtdemux);
|
||||
gst_element_add_pad (GST_ELEMENT (qtdemux), stream->pad);
|
||||
}
|
||||
|
||||
|
@ -2117,9 +2118,12 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak)
|
|||
}
|
||||
samples[j].chunk = j;
|
||||
samples[j].offset = chunk_offset;
|
||||
samples[j].size =
|
||||
samples_per_chunk * stream->bytes_per_frame /
|
||||
stream->samples_per_packet / stream->compression;
|
||||
if (stream->samples_per_packet * stream->compression != 0)
|
||||
samples[j].size =
|
||||
samples_per_chunk * stream->bytes_per_frame /
|
||||
stream->samples_per_packet / stream->compression;
|
||||
else
|
||||
samples[j].size = 0;
|
||||
samples[j].duration =
|
||||
samples_per_chunk * GST_SECOND / (stream->rate / 2);
|
||||
samples[j].timestamp = timestamp;
|
||||
|
|
Loading…
Reference in a new issue