avcodec/ffv1enc: update buffer check for 16bps
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Sep 2013 15:58:18 +0000 (17:58 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Sep 2013 22:02:30 +0000 (00:02 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3728603f1854b5c79d1a64dd3b41b80640ef1e7f)

Conflicts:

libavcodec/ffv1enc.c
(cherry picked from commit c900c6e5c26cd86cf34f9c8d4347cedbd01f3935)

libavcodec/ffv1.c

index c3034d3..c2b4942 100644 (file)
@@ -451,7 +451,7 @@ static av_always_inline int encode_line(FFV1Context *s, int w,
     int run_mode=0;
 
     if(s->ac){
-        if(c->bytestream_end - c->bytestream < w*20){
+        if(c->bytestream_end - c->bytestream < w*35){
             av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n");
             return -1;
         }