diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-11-09 10:14:46 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-11-16 17:47:09 +0100 |
| commit | 45bde93eefa78c1bdb0936109fbd2e2fb27fbfe7 (patch) | |
| tree | b1ca0cfe82ba268162236c3a9ee7b33e9c4f50bf | |
| parent | fb26d761676ffbf3394b767b9c199947c160c344 (diff) | |
| download | ffmpeg-45bde93eefa78c1bdb0936109fbd2e2fb27fbfe7.tar.gz | |
sunrastenc: use the AVFrame API properly.
| -rw-r--r-- | libavcodec/sunrastenc.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/libavcodec/sunrastenc.c b/libavcodec/sunrastenc.c index 58d0fb8d31..25ae9bd039 100644 --- a/libavcodec/sunrastenc.c +++ b/libavcodec/sunrastenc.c @@ -25,7 +25,6 @@ #include "sunrast.h" typedef struct SUNRASTContext { - AVFrame picture; PutByteContext p; int depth; ///< depth of pixel int length; ///< length (bytes) of image @@ -154,7 +153,10 @@ static av_cold int sunrast_encode_init(AVCodecContext *avctx) return AVERROR(EINVAL); } - avctx->coded_frame = &s->picture; + avctx->coded_frame = av_frame_alloc(); + if (!avctx->coded_frame) + return AVERROR(ENOMEM); + avctx->coded_frame->key_frame = 1; avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; s->maptype = RMT_NONE; @@ -207,6 +209,12 @@ static int sunrast_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, return 0; } +static av_cold int sunrast_encode_close(AVCodecContext *avctx) +{ + av_frame_free(&avctx->coded_frame); + return 0; +} + static const AVCodecDefault sunrast_defaults[] = { { "coder", "rle" }, { NULL }, @@ -219,6 +227,7 @@ AVCodec ff_sunrast_encoder = { .id = AV_CODEC_ID_SUNRAST, .priv_data_size = sizeof(SUNRASTContext), .init = sunrast_encode_init, + .close = sunrast_encode_close, .encode2 = sunrast_encode_frame, .defaults = sunrast_defaults, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_BGR24, |