diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-01 02:40:19 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-01 20:28:49 +0100 |
| commit | e939c7b7f533af3af8db2c2791ad403f650e8548 (patch) | |
| tree | 878b6c8f12f3846fec2e5454060d39c45a8dca7f | |
| parent | 612ef09a1819da800865372df25378efffcf9acf (diff) | |
| download | ffmpeg-e939c7b7f533af3af8db2c2791ad403f650e8548.tar.gz | |
avcodec/utvideoenc: fix slice_bits size
Fixes assertion failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0a8c90202bb906747168a698b6837496f82c717c)
Conflicts:
libavcodec/utvideoenc.c
(cherry picked from commit 57522ca79cc38c279123596d3288ddbf56fa8903)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/utvideoenc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/utvideoenc.c b/libavcodec/utvideoenc.c index acb25c3899..ce9f249431 100644 --- a/libavcodec/utvideoenc.c +++ b/libavcodec/utvideoenc.c @@ -468,7 +468,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; @@ -525,8 +525,7 @@ static int utvideo_encode_frame(AVCodecContext *avctx, AVPacket *pkt, bytestream2_init_writer(&pb, dst, pkt->size); - av_fast_malloc(&c->slice_bits, &c->slice_bits_size, - width * height + FF_INPUT_BUFFER_PADDING_SIZE); + 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"); |