From: Michael Niedermayer <michaelni@gmx.at>
Date: Sat, 1 Mar 2014 01:40:19 +0000 (+0100)
Subject: avcodec/utvideoenc: fix slice_bits size
X-Git-Tag: android-x86-6.0-r1~6935
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0a8c90202bb906747168a698b6837496f82c717c;p=android-x86%2Fexternal-ffmpeg.git

avcodec/utvideoenc: fix slice_bits size

Fixes assertion failure

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

diff --git a/libavcodec/utvideoenc.c b/libavcodec/utvideoenc.c
index 74b28f9905..0db85a871f 100644
--- a/libavcodec/utvideoenc.c
+++ b/libavcodec/utvideoenc.c
@@ -494,7 +494,7 @@ static int encode_plane(AVCodecContext *avctx, uint8_t *src,
          * get the offset in bits and convert to bytes.
          */
         offset += write_huff_codes(dst + sstart * width, c->slice_bits,
-                                   width * (send - sstart), width,
+                                   width * height + 4, width,
                                    send - sstart, he) >> 3;
 
         slice_len = offset - slice_len;
@@ -551,7 +551,7 @@ static int utvideo_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
 
     bytestream2_init_writer(&pb, dst, pkt->size);
 
-    av_fast_padded_malloc(&c->slice_bits, &c->slice_bits_size, width * height);
+    av_fast_padded_malloc(&c->slice_bits, &c->slice_bits_size, width * height + 4);
 
     if (!c->slice_bits) {
         av_log(avctx, AV_LOG_ERROR, "Cannot allocate temporary buffer 2.\n");