diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-23 02:16:49 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-23 02:16:49 +0400 |
| commit | 464cef4c14a6a550ee30810416d18686b5f3ffa0 (patch) | |
| tree | 906af3c9685883fb966b8d95f2e416e68b9fee36 /libavformat/mov.c | |
| parent | 9759d2b886057b90355716edb23262e17f9bc3f9 (diff) | |
| parent | 5023b89bba198b2f8e43b7f555aeb9c30d33db9f (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
xwma: Validate channels and bits_per_coded_sample.
mov: Do not read past the end of the ctts_data table.
mov: Add missing terminator to mov_ch_layout_map_1ch.
asf: reset side data elements on packet copy.
wmavoice: fix stack overread.
wmalossless: error out if a subframe is not used by any channel.
vqa: check palette chunk size before reading data.
wmalossless: reset sample pointer for each subframe.
wmalossless: error out on invalid values for order.
Conflicts:
libavcodec/vqavideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mov.c')
| -rw-r--r-- | libavformat/mov.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index de290aa70c..2687a88816 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2874,7 +2874,7 @@ static int mov_read_packet(AVFormatContext *s, AVPacket *pkt) pkt->stream_index = sc->ffindex; pkt->dts = sample->timestamp; - if (sc->ctts_data) { + if (sc->ctts_data && sc->ctts_index < sc->ctts_count) { pkt->pts = pkt->dts + sc->dts_shift + sc->ctts_data[sc->ctts_index].duration; /* update ctts context */ sc->ctts_sample++; |