From d6604b29ef544793479d7fb4e05ef6622bb3e534 Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Wed, 15 Jul 2015 18:41:20 +0100 Subject: Gather all coded_frame allocations and free functions to a single place Allocating coded_frame is what most encoders do anyway, so it makes sense to always allocate and free it in a single place. Moreover a lot of encoders freed the frame with av_freep() instead of the correct API av_frame_free(). This bring uniformity to encoder behaviour and prevents applications from erroneusly accessing this field when not allocated. Additionally this helps isolating encoders that export information with coded_frame, and heavily simplifies its deprecation. Signed-off-by: Vittorio Giovara --- libavcodec/nvenc.c | 6 ------ 1 file changed, 6 deletions(-) (limited to 'libavcodec/nvenc.c') diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index ea260b0c87..388fbe476d 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -771,8 +771,6 @@ av_cold int ff_nvenc_encode_close(AVCodecContext *avctx) NV_ENCODE_API_FUNCTION_LIST *nv = &ctx->nvel.nvenc_funcs; int i; - av_frame_free(&avctx->coded_frame); - if (ctx->in) { for (i = 0; i < ctx->nb_surfaces; ++i) { nv->nvEncDestroyInputBuffer(ctx->nvenc_ctx, ctx->in[i].in); @@ -819,10 +817,6 @@ av_cold int ff_nvenc_encode_init(AVCodecContext *avctx) return ret; } - avctx->coded_frame = av_frame_alloc(); - if (!avctx->coded_frame) - return AVERROR(ENOMEM); - return 0; } -- cgit v1.2.3