videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

png: Clear up the calculation of max packet size 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Donny Yang 2015-03-31 12:37:22 +00:00 committed by Michael Niedermayer
parent 65a646eb0b
commit 749fbfd081
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/pngenc.c
View File

@ -307,12 +307,16 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
row_size = (avctx->width * s->bits_per_pixel + 7) >> 3;
enc_row_size = deflateBound(&s->zstream, row_size);
max_packet_size = avctx->height * (int64_t)(enc_row_size +
((enc_row_size + IOBUF_SIZE - 1) / IOBUF_SIZE) * 12)
+ FF_MIN_BUFFER_SIZE;
max_packet_size =
FF_MIN_BUFFER_SIZE + // headers
avctx->height * (
enc_row_size +
12 * (((int64_t)enc_row_size + IOBUF_SIZE - 1) / IOBUF_SIZE) // IDAT * ceil(enc_row_size / IOBUF_SIZE)
);
if (max_packet_size > INT_MAX)
return AVERROR(ENOMEM);
if ((ret = ff_alloc_packet2(avctx, pkt, max_packet_size)) < 0)
ret = ff_alloc_packet2(avctx, pkt, max_packet_size);
if (ret < 0)
return ret;
s->bytestream_start =