generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/avidec: Dont assert the existence of an index for video streams.

Browse Source 
Its possible in various rare cases that an index cannot be created or allocated.
Fixes assertion failure
Fixes: signal_sigabrt_7ffff7126425_7712_pokem.avi

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 7865759409)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-11-22 15:08:04 +01:00
parent 69aa3d5b88
commit 898ab02557
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/avidec.c
View File

@@ -1306,10 +1306,9 @@ FF_ENABLE_DEPRECATION_WARNINGS
size); size);
pkt->stream_index = avi->stream_index; pkt->stream_index = avi->stream_index;
if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) { if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO && st->index_entries) {
AVIndexEntry *e; AVIndexEntry *e;
int index; int index;
av_assert0(st->index_entries);
index = av_index_search_timestamp(st, ast->frame_offset, 0); index = av_index_search_timestamp(st, ast->frame_offset, 0);
e = &st->index_entries[index]; e = &st->index_entries[index];