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

mpegvideo: Drop a faulty assert

Browse Source 
That check is easily reachable by faulty input.

CC:libav-stable@libav.org
Reported-by: Torsten Sadowski <tsadowski@gmx.net>
(cherry picked from commit 72072bf9de)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
This commit is contained in:
Luca Barbato
2013-10-22 19:17:10 +02:00
committed by Reinhard Tartler
parent 24a8dfd37b
commit 0e8ae6d10c
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/mpegvideo.c
View File

@@ -1521,8 +1521,12 @@ int ff_MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx)
s->last_picture_ptr->owner2 = s; s->last_picture_ptr->owner2 = s;
} }
assert(s->pict_type == AV_PICTURE_TYPE_I || (s->last_picture_ptr && if (s->pict_type != AV_PICTURE_TYPE_I &&
s->last_picture_ptr->f.data[0])); !(s->last_picture_ptr && s->last_picture_ptr->f.data[0])) {
av_log(s, AV_LOG_ERROR,
"Non-reference picture received and no reference available\n");
return AVERROR_INVALIDDATA;
}
if (s->picture_structure!= PICT_FRAME && s->out_format != FMT_H264) { if (s->picture_structure!= PICT_FRAME && s->out_format != FMT_H264) {
int i; int i;