summaryrefslogtreecommitdiff
path: root/libavcodec/nvenc.c
diff options
context:
space:
mode:
authorVittorio Giovara <vittorio.giovara@gmail.com>2015-07-15 18:41:20 +0100
committerVittorio Giovara <vittorio.giovara@gmail.com>2015-07-20 14:16:15 +0100
commitd6604b29ef544793479d7fb4e05ef6622bb3e534 (patch)
tree37d5559063e276f17da8036e4c08bb8aa4b05534 /libavcodec/nvenc.c
parent91f9b6579ac684c4b51c4cd0dbaed0a4f8295edf (diff)
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 <vittorio.giovara@gmail.com>
Diffstat (limited to 'libavcodec/nvenc.c')
-rw-r--r--libavcodec/nvenc.c6
1 files changed, 0 insertions, 6 deletions
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;
}