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

tiffenc: fix packet size calculation 

Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
Tristan Matthews 2014-06-13 10:57:12 -04:00 committed by Anton Khirnov
parent fe4d5fe936
commit 4910684492
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/tiffenc.c
View File

@ -218,6 +218,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
int is_yuv = 0; int is_yuv = 0;
uint8_t *yuv_line = NULL; uint8_t *yuv_line = NULL;
int shift_h, shift_v; int shift_h, shift_v;
int packet_size;
const AVPixFmtDescriptor *pfd; const AVPixFmtDescriptor *pfd;
s->avctx = avctx; s->avctx = avctx;
@ -288,10 +289,11 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
strips = (s->height - 1) / s->rps + 1; strips = (s->height - 1) / s->rps + 1;
packet_size = avctx->height * ((avctx->width * s->bpp + 7) >> 3) * 2 +
avctx->height * 4 + FF_MIN_BUFFER_SIZE;
if (!pkt->data && if (!pkt->data &&
(ret = av_new_packet(pkt, (ret = av_new_packet(pkt, packet_size)) < 0) {
avctx->width * avctx->height * s->bpp * 2 +
avctx->height * 4 + FF_MIN_BUFFER_SIZE)) < 0) {
av_log(avctx, AV_LOG_ERROR, "Error getting output packet.\n"); av_log(avctx, AV_LOG_ERROR, "Error getting output packet.\n");
return ret; return ret;
} }