virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

pngenc: make max_packet_size 64bit check check it.

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-03-22 21:09:03 +01:00
parent 50a3867bab
commit afc0cc22e1
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/pngenc.c
View File

@ -219,7 +219,8 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
PNGEncContext *s = avctx->priv_data; PNGEncContext *s = avctx->priv_data;
AVFrame * const p= &s->picture; AVFrame * const p= &s->picture;
int bit_depth, color_type, y, len, row_size, ret, is_progressive; int bit_depth, color_type, y, len, row_size, ret, is_progressive;
int bits_per_pixel, pass_row_size, enc_row_size, max_packet_size; int bits_per_pixel, pass_row_size, enc_row_size;
int64_t max_packet_size;
int compression_level; int compression_level;
uint8_t *ptr, *top; uint8_t *ptr, *top;
uint8_t *crow_base = NULL, *crow_buf, *crow; uint8_t *crow_base = NULL, *crow_buf, *crow;
@ -286,9 +287,11 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
return -1; return -1;
enc_row_size = deflateBound(&s->zstream, row_size); enc_row_size = deflateBound(&s->zstream, row_size);
max_packet_size = avctx->height * (enc_row_size + max_packet_size = avctx->height * (int64_t)(enc_row_size +
((enc_row_size + IOBUF_SIZE - 1) / IOBUF_SIZE) * 12) ((enc_row_size + IOBUF_SIZE - 1) / IOBUF_SIZE) * 12)
+ FF_MIN_BUFFER_SIZE; + FF_MIN_BUFFER_SIZE;
if (max_packet_size > INT_MAX)
return AVERROR(ENOMEM);
if ((ret = ff_alloc_packet2(avctx, pkt, max_packet_size)) < 0) { if ((ret = ff_alloc_packet2(avctx, pkt, max_packet_size)) < 0) {
return ret; return ret;
} }