RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/utvideoenc: fix slice_bits size 

Fixes assertion failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0a8c90202b)

Conflicts:

	libavcodec/utvideoenc.c
(cherry picked from commit 57522ca79cc38c279123596d3288ddbf56fa8903)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-03-01 02:40:19 +01:00
parent b580bae53a
commit ddcccababe
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/utvideoenc.c
View File

@ -468,7 +468,7 @@ static int encode_plane(AVCodecContext *avctx, uint8_t *src,
* get the offset in bits and convert to bytes. * get the offset in bits and convert to bytes.
*/ */
offset += write_huff_codes(dst + sstart * width, c->slice_bits, offset += write_huff_codes(dst + sstart * width, c->slice_bits,
width * (send - sstart), width, width * height + 4, width,
send - sstart, he) >> 3; send - sstart, he) >> 3;
slice_len = offset - slice_len; 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); bytestream2_init_writer(&pb, dst, pkt->size);
av_fast_malloc(&c->slice_bits, &c->slice_bits_size, av_fast_padded_malloc(&c->slice_bits, &c->slice_bits_size, width * height + 4);
width * height + FF_INPUT_BUFFER_PADDING_SIZE);
if (!c->slice_bits) { if (!c->slice_bits) {
av_log(avctx, AV_LOG_ERROR, "Cannot allocate temporary buffer 2.\n"); av_log(avctx, AV_LOG_ERROR, "Cannot allocate temporary buffer 2.\n");