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/pngenc.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/pngenc.c')
| -rw-r--r-- | libavcodec/pngenc.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c index 3d11f370cb..bbeee0199c 100644 --- a/libavcodec/pngenc.c +++ b/libavcodec/pngenc.c @@ -455,10 +455,6 @@ static av_cold int png_enc_init(AVCodecContext *avctx) { PNGEncContext *s = avctx->priv_data; - 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; @@ -473,12 +469,6 @@ static av_cold int png_enc_init(AVCodecContext *avctx) return 0; } -static av_cold int png_enc_close(AVCodecContext *avctx) -{ - av_frame_free(&avctx->coded_frame); - return 0; -} - AVCodec ff_png_encoder = { .name = "png", .long_name = NULL_IF_CONFIG_SMALL("PNG (Portable Network Graphics) image"), @@ -486,7 +476,6 @@ AVCodec ff_png_encoder = { .id = AV_CODEC_ID_PNG, .priv_data_size = sizeof(PNGEncContext), .init = png_enc_init, - .close = png_enc_close, .encode2 = encode_frame, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_RGB24, AV_PIX_FMT_RGB32, AV_PIX_FMT_PAL8, AV_PIX_FMT_GRAY8, |