[FFmpeg-cvslog] cljr: use the AVFrame API properly.
Anton Khirnov
git at videolan.org
Sun Nov 17 00:58:05 CET 2013
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sat Nov 9 10:14:46 2013 +0100| [845020ed89caca12af3470289af9c9626e71e0ea] | committer: Anton Khirnov
cljr: use the AVFrame API properly.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=845020ed89caca12af3470289af9c9626e71e0ea
---
libavcodec/cljr.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/libavcodec/cljr.c b/libavcodec/cljr.c
index f6dbb76..ad0f729 100644
--- a/libavcodec/cljr.c
+++ b/libavcodec/cljr.c
@@ -98,16 +98,18 @@ AVCodec ff_cljr_decoder = {
#endif
#if CONFIG_CLJR_ENCODER
-typedef struct CLJRContext {
- AVFrame picture;
-} CLJRContext;
-
static av_cold int encode_init(AVCodecContext *avctx)
{
- CLJRContext * const a = avctx->priv_data;
+ avctx->coded_frame = av_frame_alloc();
+ if (!avctx->coded_frame)
+ return AVERROR(ENOMEM);
- avctx->coded_frame = &a->picture;
+ return 0;
+}
+static av_cold int encode_close(AVCodecContext *avctx)
+{
+ av_frame_free(&avctx->coded_frame);
return 0;
}
@@ -155,9 +157,9 @@ AVCodec ff_cljr_encoder = {
.long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"),
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_CLJR,
- .priv_data_size = sizeof(CLJRContext),
.init = encode_init,
.encode2 = encode_frame,
+ .close = encode_close,
.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV411P,
AV_PIX_FMT_NONE },
};
More information about the ffmpeg-cvslog
mailing list