diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-07-15 18:41:20 +0100 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-07-20 14:16:15 +0100 |
| commit | d6604b29ef544793479d7fb4e05ef6622bb3e534 (patch) | |
| tree | 37d5559063e276f17da8036e4c08bb8aa4b05534 /libavcodec/libx265.c | |
| parent | 91f9b6579ac684c4b51c4cd0dbaed0a4f8295edf (diff) | |
| download | ffmpeg-d6604b29ef544793479d7fb4e05ef6622bb3e534.tar.gz | |
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/libx265.c')
| -rw-r--r-- | libavcodec/libx265.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index f5687f6a09..145480fc04 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -66,8 +66,6 @@ static av_cold int libx265_encode_close(AVCodecContext *avctx) { libx265Context *ctx = avctx->priv_data; - av_frame_free(&avctx->coded_frame); - ctx->api->param_free(ctx->params); if (ctx->encoder) @@ -92,12 +90,6 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx) return AVERROR(ENOSYS); } - avctx->coded_frame = av_frame_alloc(); - if (!avctx->coded_frame) { - av_log(avctx, AV_LOG_ERROR, "Could not allocate frame.\n"); - return AVERROR(ENOMEM); - } - ctx->params = ctx->api->param_alloc(); if (!ctx->params) { av_log(avctx, AV_LOG_ERROR, "Could not allocate x265 param structure.\n"); |