diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-24 03:03:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-24 03:03:17 +0100 |
| commit | f1470ca685026df163c3af9c844231c650472193 (patch) | |
| tree | 20ebac39d2db937ebc0b20ae4648050ddf4a15fb /libavcodec/ratecontrol.c | |
| parent | 66244baf1dc866dc1a0b93ae542181b2779b6e93 (diff) | |
| download | ffmpeg-f1470ca685026df163c3af9c844231c650472193.tar.gz | |
ratecontrol: Fix assertion failure on mismatching 2pass file.
Fixes Ticket582
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ratecontrol.c')
| -rw-r--r-- | libavcodec/ratecontrol.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c index d1a9a582fd..59f69a27a8 100644 --- a/libavcodec/ratecontrol.c +++ b/libavcodec/ratecontrol.c @@ -691,7 +691,10 @@ float ff_rate_estimate_qscale(MpegEncContext *s, int dry_run) if(s->flags&CODEC_FLAG_PASS2){ assert(picture_number>=0); - assert(picture_number<rcc->num_entries); + if(picture_number >= rcc->num_entries) { + av_log(s, AV_LOG_ERROR, "Input is longer than 2-pass log file\n"); + return -1; + } rce= &rcc->entry[picture_number]; wanted_bits= rce->expected_bits; }else{ |