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/asvenc.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/asvenc.c')
-rw-r--r-- | libavcodec/asvenc.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/libavcodec/asvenc.c b/libavcodec/asvenc.c index 08796150f1..af0687a1e4 100644 --- a/libavcodec/asvenc.c +++ b/libavcodec/asvenc.c @@ -282,9 +282,6 @@ static av_cold int encode_init(AVCodecContext *avctx) int i; const int scale = avctx->codec_id == AV_CODEC_ID_ASV1 ? 1 : 2; - avctx->coded_frame = av_frame_alloc(); - if (!avctx->coded_frame) - return AVERROR(ENOMEM); avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; avctx->coded_frame->key_frame = 1; @@ -313,13 +310,6 @@ static av_cold int encode_init(AVCodecContext *avctx) return 0; } -static av_cold int asv_encode_close(AVCodecContext *avctx) -{ - av_frame_free(&avctx->coded_frame); - - return 0; -} - #if CONFIG_ASV1_ENCODER AVCodec ff_asv1_encoder = { .name = "asv1", @@ -329,11 +319,9 @@ AVCodec ff_asv1_encoder = { .priv_data_size = sizeof(ASV1Context), .init = encode_init, .encode2 = encode_frame, - .close = asv_encode_close, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif @@ -346,10 +334,8 @@ AVCodec ff_asv2_encoder = { .priv_data_size = sizeof(ASV1Context), .init = encode_init, .encode2 = encode_frame, - .close = asv_encode_close, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | - FF_CODEC_CAP_INIT_CLEANUP, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif |