From 670c74518f2d67dfa80d3603b93fed1abb3d7e92 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 9 Nov 2013 10:14:46 +0100 Subject: [PATCH] c93: use the AVFrame API properly. --- libavcodec/c93.c | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/libavcodec/c93.c b/libavcodec/c93.c index d1f8629d81..c7cc68296a 100644 --- a/libavcodec/c93.c +++ b/libavcodec/c93.c @@ -24,7 +24,7 @@ #include "internal.h" typedef struct { - AVFrame pictures[2]; + AVFrame *pictures[2]; int currentpic; } C93DecoderContext; @@ -46,21 +46,27 @@ typedef enum { #define C93_HAS_PALETTE 0x01 #define C93_FIRST_FRAME 0x02 -static av_cold int decode_init(AVCodecContext *avctx) -{ - C93DecoderContext *s = avctx->priv_data; - avctx->pix_fmt = AV_PIX_FMT_PAL8; - avcodec_get_frame_defaults(&s->pictures[0]); - avcodec_get_frame_defaults(&s->pictures[1]); - return 0; -} - static av_cold int decode_end(AVCodecContext *avctx) { C93DecoderContext * const c93 = avctx->priv_data; - av_frame_unref(&c93->pictures[0]); - av_frame_unref(&c93->pictures[1]); + av_frame_free(&c93->pictures[0]); + av_frame_free(&c93->pictures[1]); + + return 0; +} + +static av_cold int decode_init(AVCodecContext *avctx) +{ + C93DecoderContext *s = avctx->priv_data; + avctx->pix_fmt = AV_PIX_FMT_PAL8; + + s->pictures[0] = av_frame_alloc(); + s->pictures[1] = av_frame_alloc(); + if (!s->pictures[0] || !s->pictures[1]) { + decode_end(avctx); + return AVERROR(ENOMEM); + } return 0; } @@ -121,8 +127,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; C93DecoderContext * const c93 = avctx->priv_data; - AVFrame * const newpic = &c93->pictures[c93->currentpic]; - AVFrame * const oldpic = &c93->pictures[c93->currentpic^1]; + AVFrame * const newpic = c93->pictures[c93->currentpic]; + AVFrame * const oldpic = c93->pictures[c93->currentpic^1]; GetByteContext gb; uint8_t *out; int stride, ret, i, x, y, b, bt = 0;