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

Only do 1 malloc instead of 3 and check for failure. 

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
This commit is contained in:
Reimar Döffinger 2011-10-29 13:40:34 +02:00
parent 5c9b9165cd
commit d9f4dc52a0
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/proresenc.c
View File

@ -549,9 +549,11 @@ static av_cold int prores_encode_init(AVCodecContext *avctx)
} }
if ((avctx->height & 0xf) || (avctx->width & 0xf)) { if ((avctx->height & 0xf) || (avctx->width & 0xf)) {
ctx->fill_y = av_malloc(DEFAULT_SLICE_MB_WIDTH << 9); ctx->fill_y = av_malloc(4 * (DEFAULT_SLICE_MB_WIDTH << 8));
ctx->fill_u = av_malloc(DEFAULT_SLICE_MB_WIDTH << 8); if (!ctx->fill_y)
ctx->fill_v = av_malloc(DEFAULT_SLICE_MB_WIDTH << 8); return AVERROR(ENOMEM);
ctx->fill_u = ctx->fill_y + (DEFAULT_SLICE_MB_WIDTH << 9);
ctx->fill_v = ctx->fill_u + (DEFAULT_SLICE_MB_WIDTH << 8);
} }
if (avctx->profile == FF_PROFILE_UNKNOWN) { if (avctx->profile == FF_PROFILE_UNKNOWN) {
@ -587,9 +589,7 @@ static av_cold int prores_encode_close(AVCodecContext *avctx)
{ {
ProresContext* ctx = avctx->priv_data; ProresContext* ctx = avctx->priv_data;
av_freep(&avctx->coded_frame); av_freep(&avctx->coded_frame);
av_free(ctx->fill_y); av_freep(&ctx->fill_y);
av_free(ctx->fill_u);
av_free(ctx->fill_v);
return 0; return 0;
} }