aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-05-31 00:47:36 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-06-07 00:55:24 +0200
commit55a97399bcbcc571d4ca53fcadeb47add21c0283 (patch)
tree1136ef188fb15aa31fa9a827f0fb7cf166aa6aac
parenteecbd9a78f38b3eaa04b9e0158b9c65559c3cba9 (diff)
downloadffmpeg-55a97399bcbcc571d4ca53fcadeb47add21c0283.tar.gz
ffv1: fix reading global header with CRC
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 21fdf1ccf0a17410943454a48764ee2b05d4b1ac) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/ffv1.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index 901e79e669..bffd744937 100644
--- a/libavcodec/ffv1.c
+++ b/libavcodec/ffv1.c
@@ -1697,8 +1697,10 @@ static int read_extra_header(FFV1Context *f){
ff_build_rac_states(c, 0.05*(1LL<<32), 256-8);
f->version= get_symbol(c, state, 0);
- if(f->version > 2)
+ if(f->version > 2) {
+ c->bytestream_end -= 4;
f->minor_version= get_symbol(c, state, 0);
+ }
f->ac= f->avctx->coder_type= get_symbol(c, state, 0);
if(f->ac>1){
for(i=1; i<256; i++){