Browse Source

avcodec/ffv1enc: Allocate smaller packet if the worst case size cannot be allocated

We are checking during encoding if there is enough space as version 4 needs that
check.

Fixes Ticket6005

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 38a7834bbb)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
tags/n3.2.3
Michael Niedermayer 9 years ago
parent
commit
0e6febff5a
1 changed files with 5 additions and 0 deletions
  1. +5
    -0
      libavcodec/ffv1enc.c

+ 5
- 0
libavcodec/ffv1enc.c View File

@@ -1144,6 +1144,11 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
if (f->version > 3)
maxsize = AV_INPUT_BUFFER_MIN_SIZE + avctx->width*avctx->height*3LL*4;

if (maxsize > INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE - 32) {
av_log(avctx, AV_LOG_WARNING, "Cannot allocate worst case packet size, the encoding could fail\n");
maxsize = INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE - 32;
}

if ((ret = ff_alloc_packet2(avctx, pkt, maxsize, 0)) < 0)
return ret;



Loading…
Cancel
Save