summaryrefslogtreecommitdiff
path: root/libavcodec/proresenc.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/proresenc.c
parent91f9b6579ac684c4b51c4cd0dbaed0a4f8295edf (diff)
downloadffmpeg-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/proresenc.c')
-rw-r--r--libavcodec/proresenc.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/libavcodec/proresenc.c b/libavcodec/proresenc.c
index b71a7db9b4..3e99d106ac 100644
--- a/libavcodec/proresenc.c
+++ b/libavcodec/proresenc.c
@@ -1097,8 +1097,6 @@ static av_cold int encode_close(AVCodecContext *avctx)
ProresContext *ctx = avctx->priv_data;
int i;
- av_freep(&avctx->coded_frame);
-
if (ctx->tdata) {
for (i = 0; i < avctx->thread_count; i++)
av_free(ctx->tdata[i].nodes);
@@ -1132,9 +1130,6 @@ static av_cold int encode_init(AVCodecContext *avctx)
int interlaced = !!(avctx->flags & CODEC_FLAG_INTERLACED_DCT);
avctx->bits_per_raw_sample = 10;
- avctx->coded_frame = av_frame_alloc();
- if (!avctx->coded_frame)
- return AVERROR(ENOMEM);
ctx->fdct = prores_fdct;
ctx->scantable = interlaced ? ff_prores_interlaced_scan