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/xwdenc.c | |
| parent | 91f9b6579ac684c4b51c4cd0dbaed0a4f8295edf (diff) | |
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/xwdenc.c')
| -rw-r--r-- | libavcodec/xwdenc.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/libavcodec/xwdenc.c b/libavcodec/xwdenc.c index 54599a08a1..97a3eb8fe5 100644 --- a/libavcodec/xwdenc.c +++ b/libavcodec/xwdenc.c @@ -30,15 +30,6 @@ #define WINDOW_NAME "lavcxwdenc" #define WINDOW_NAME_SIZE 11 -static av_cold int xwd_encode_init(AVCodecContext *avctx) -{ - avctx->coded_frame = av_frame_alloc(); - if (!avctx->coded_frame) - return AVERROR(ENOMEM); - - return 0; -} - static int xwd_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVFrame *p, int *got_packet) { @@ -213,21 +204,12 @@ static int xwd_encode_frame(AVCodecContext *avctx, AVPacket *pkt, return 0; } -static av_cold int xwd_encode_close(AVCodecContext *avctx) -{ - av_freep(&avctx->coded_frame); - - return 0; -} - AVCodec ff_xwd_encoder = { .name = "xwd", .long_name = NULL_IF_CONFIG_SMALL("XWD (X Window Dump) image"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_XWD, - .init = xwd_encode_init, .encode2 = xwd_encode_frame, - .close = xwd_encode_close, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_BGRA, AV_PIX_FMT_RGBA, AV_PIX_FMT_ARGB, |