[FFmpeg-cvslog] ffv1: fix reading global header with CRC

Michael Niedermayer git at videolan.org
Thu Jun 7 01:44:16 CEST 2012


ffmpeg | branch: release/0.11 | Michael Niedermayer <michaelni at gmx.at> | Thu May 31 00:47:36 2012 +0200| [55a97399bcbcc571d4ca53fcadeb47add21c0283] | committer: Michael Niedermayer

ffv1: fix reading global header with CRC

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 21fdf1ccf0a17410943454a48764ee2b05d4b1ac)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=55a97399bcbcc571d4ca53fcadeb47add21c0283
---

 libavcodec/ffv1.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index 901e79e..bffd744 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++){



More information about the ffmpeg-cvslog mailing list