virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

avcodec/huffyuvenc: only allocate stats_out when it will be used

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-02-15 15:06:29 +01:00
parent 776cda748d
commit 59279bf21f
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/huffyuvenc.c
View File

@ -217,11 +217,13 @@ static av_cold int encode_init(AVCodecContext *avctx)
ff_huffyuv_common_init(avctx); ff_huffyuv_common_init(avctx);
avctx->extradata = av_mallocz(3*MAX_N + 4); avctx->extradata = av_mallocz(3*MAX_N + 4);
#define STATS_OUT_SIZE 21*MAX_N*3 + 4 if (!avctx->extradata)
avctx->stats_out = av_mallocz(STATS_OUT_SIZE); // 21*256*3(%llu ) + 3(\n) + 1(0) = 16132
if (!avctx->extradata || !avctx->stats_out) {
av_freep(&avctx->stats_out);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
if (s->flags&CODEC_FLAG_PASS1) {
#define STATS_OUT_SIZE 21*MAX_N*3 + 4
avctx->stats_out = av_mallocz(STATS_OUT_SIZE); // 21*256*3(%llu ) + 3(\n) + 1(0) = 16132
if (!avctx->stats_out)
return AVERROR(ENOMEM);
} }
s->version = 2; s->version = 2;
@ -956,7 +958,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
if (end <= p) if (end <= p)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
} else } else if (avctx->stats_out)
avctx->stats_out[0] = '\0'; avctx->stats_out[0] = '\0';
if (!(s->avctx->flags2 & CODEC_FLAG2_NO_OUTPUT)) { if (!(s->avctx->flags2 & CODEC_FLAG2_NO_OUTPUT)) {
flush_put_bits(&s->pb); flush_put_bits(&s->pb);