From 057dce5f21cd70db1ef6e3b67644a39f0d51aba5 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Fri, 30 Aug 2013 13:14:58 +0000 Subject: [PATCH] kgv1dec: make decoder independent of sizeof(AVFrame) Signed-off-by: Paul B Mahol --- libavcodec/kgv1dec.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/libavcodec/kgv1dec.c b/libavcodec/kgv1dec.c index 9c4823988e..9064897276 100644 --- a/libavcodec/kgv1dec.c +++ b/libavcodec/kgv1dec.c @@ -32,14 +32,14 @@ typedef struct { AVCodecContext *avctx; - AVFrame prev; + AVFrame *prev; } KgvContext; static void decode_flush(AVCodecContext *avctx) { KgvContext * const c = avctx->priv_data; - av_frame_unref(&c->prev); + av_frame_unref(c->prev); } static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, @@ -65,7 +65,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, return res; if (w != avctx->width || h != avctx->height) { - av_frame_unref(&c->prev); + av_frame_unref(c->prev); avcodec_set_dimensions(avctx, w, h); } @@ -74,8 +74,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, if ((res = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0) return res; out = frame->data[0]; - if (c->prev.data[0]) { - prev = c->prev.data[0]; + if (c->prev->data[0]) { + prev = c->prev->data[0]; } else { prev = NULL; } @@ -145,8 +145,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, if (outcnt - maxcnt) av_log(avctx, AV_LOG_DEBUG, "frame finished with %d diff\n", outcnt - maxcnt); - av_frame_unref(&c->prev); - if ((res = av_frame_ref(&c->prev, frame)) < 0) + av_frame_unref(c->prev); + if ((res = av_frame_ref(c->prev, frame)) < 0) return res; *got_frame = 1; @@ -162,12 +162,17 @@ static av_cold int decode_init(AVCodecContext *avctx) avctx->pix_fmt = AV_PIX_FMT_RGB555; avctx->flags |= CODEC_FLAG_EMU_EDGE; + c->prev = av_frame_alloc(); + if (!c->prev) + return AVERROR(ENOMEM); + return 0; } static av_cold int decode_end(AVCodecContext *avctx) { - decode_flush(avctx); + KgvContext * const c = avctx->priv_data; + av_frame_free(&c->prev); return 0; }