ffv1enc: fix integer overflow with high resolutions and lots of slices.
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 29 Sep 2012 17:11:25 +0000 (19:11 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 3 Dec 2012 18:36:15 +0000 (19:36 +0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f049729e613ed3fb0abf767eb14423f545385c6e)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/ffv1.c

index 8f89542..572bcbb 100644 (file)
@@ -1313,9 +1313,8 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
 
     for(i=1; i<f->slice_count; i++){
         FFV1Context *fs= f->slice_context[i];
-        uint8_t *start = pkt->data + (pkt->size-used_count)*i/f->slice_count;
+        uint8_t *start = pkt->data + (pkt->size-used_count)*(int64_t)i/f->slice_count;
         int len = pkt->size/f->slice_count;
-
         ff_init_range_encoder(&fs->c, start, len);
     }
     avctx->execute(avctx, encode_slice, &f->slice_context[0], NULL, f->slice_count, sizeof(void*));