diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-11-09 10:14:46 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-11-16 13:23:05 +0100 |
| commit | 2e09096da912f563c4dd889a8f25c314529bbaa6 (patch) | |
| tree | 2902c90818f2581010c9df3e25a5cd8ea4ac026e | |
| parent | 79d501a860bd48a17d37bbb7097311587dc46e6c (diff) | |
| download | ffmpeg-2e09096da912f563c4dd889a8f25c314529bbaa6.tar.gz | |
kgv1: use the AVFrame API properly.
| -rw-r--r-- | libavcodec/kgv1dec.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/libavcodec/kgv1dec.c b/libavcodec/kgv1dec.c index 62b5c6e233..1436ccbaea 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_free(&c->prev); } static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, @@ -62,7 +62,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, buf += 2; if (w != avctx->width || h != avctx->height) { - av_frame_unref(&c->prev); + av_frame_unref(c->prev); if ((res = ff_set_dimensions(avctx, w, h)) < 0) return res; } @@ -72,8 +72,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 = (uint16_t *) frame->data[0]; - if (c->prev.data[0]) { - prev = (uint16_t *) c->prev.data[0]; + if (c->prev->data[0]) { + prev = (uint16_t *) c->prev->data[0]; } else { prev = NULL; } @@ -152,8 +152,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; @@ -165,6 +165,10 @@ static av_cold int decode_init(AVCodecContext *avctx) { KgvContext * const c = avctx->priv_data; + c->prev = av_frame_alloc(); + if (!c->prev) + return AVERROR(ENOMEM); + c->avctx = avctx; avctx->pix_fmt = AV_PIX_FMT_RGB555; avctx->flags |= CODEC_FLAG_EMU_EDGE; |