mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-08-29 20:56:12 +02:00
Merge commit '49106844929b7b71ac719064d640f8aa56c89b1f'
* commit '49106844929b7b71ac719064d640f8aa56c89b1f': tiffenc: fix packet size calculation Conflicts: libavcodec/tiffenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
9f028b3f3a
@ -238,6 +238,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
|
|||||||
int ret = -1;
|
int ret = -1;
|
||||||
int is_yuv = 0, alpha = 0;
|
int is_yuv = 0, alpha = 0;
|
||||||
int shift_h, shift_v;
|
int shift_h, shift_v;
|
||||||
|
int packet_size;
|
||||||
|
|
||||||
s->width = avctx->width;
|
s->width = avctx->width;
|
||||||
s->height = avctx->height;
|
s->height = avctx->height;
|
||||||
@ -304,9 +305,10 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
|
|||||||
|
|
||||||
strips = (s->height - 1) / s->rps + 1;
|
strips = (s->height - 1) / s->rps + 1;
|
||||||
|
|
||||||
if ((ret = ff_alloc_packet2(avctx, pkt,
|
packet_size = avctx->height * ((avctx->width * s->bpp + 7) >> 3) * 2 +
|
||||||
avctx->width * avctx->height * s->bpp * 2 +
|
avctx->height * 4 + FF_MIN_BUFFER_SIZE;
|
||||||
avctx->height * 4 + FF_MIN_BUFFER_SIZE)) < 0)
|
|
||||||
|
if ((ret = ff_alloc_packet2(avctx, pkt, packet_size)) < 0)
|
||||||
return ret;
|
return ret;
|
||||||
ptr = pkt->data;
|
ptr = pkt->data;
|
||||||
s->buf_start = pkt->data;
|
s->buf_start = pkt->data;
|
||||||
|
Loading…
Reference in New Issue
Block a user