har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ffv1dec: change bitstream end check to a exact check instead of a +-1 check

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-09-24 04:58:24 +02:00
parent d8676140de
commit aea15df3b4
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/ffv1.c
View File

@ -1706,8 +1706,10 @@ static int decode_slice(AVCodecContext *c, void *arg){
decode_rgb_frame(fs, planes, width, height, p->linesize); decode_rgb_frame(fs, planes, width, height, p->linesize);
} }
if(fs->ac && f->version > 2) { if(fs->ac && f->version > 2) {
int v = fs->c.bytestream_end - fs->c.bytestream - 3 - 5*f->ec; int v;
if(v != -1 && v!= 0) { get_rac(&fs->c, (int[]){129});
v = fs->c.bytestream_end - fs->c.bytestream - 2 - 5*f->ec;
if(v) {
av_log(f->avctx, AV_LOG_ERROR, "bytestream end mismatching by %d\n", v); av_log(f->avctx, AV_LOG_ERROR, "bytestream end mismatching by %d\n", v);
fs->slice_damaged = 1; fs->slice_damaged = 1;
} }