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/cljrenc.c | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'libavcodec/cljrenc.c') diff --git a/libavcodec/cljrenc.c b/libavcodec/cljrenc.c index 2c315555e6..e2db7a6129 100644 --- a/libavcodec/cljrenc.c +++ b/libavcodec/cljrenc.c @@ -30,21 +30,6 @@ #include "internal.h" #include "put_bits.h" -static av_cold int encode_init(AVCodecContext *avctx) -{ - avctx->coded_frame = av_frame_alloc(); - if (!avctx->coded_frame) - return AVERROR(ENOMEM); - - return 0; -} - -static av_cold int encode_close(AVCodecContext *avctx) -{ - av_frame_free(&avctx->coded_frame); - return 0; -} - static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVFrame *p, int *got_packet) { @@ -89,9 +74,7 @@ AVCodec ff_cljr_encoder = { .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_CLJR, - .init = encode_init, .encode2 = encode_frame, - .close = encode_close, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV411P, AV_PIX_FMT_NONE }, }; -- cgit v1.2.3