virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

kgv1dec: make decoder independent of sizeof(AVFrame)

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2013-08-30 13:14:58 +00:00
parent ea3ce00859
commit 057dce5f21
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libavcodec/kgv1dec.c
View File

@ -32,14 +32,14 @@
typedef struct { typedef struct {
AVCodecContext *avctx; AVCodecContext *avctx;
AVFrame prev; AVFrame *prev;
} KgvContext; } KgvContext;
static void decode_flush(AVCodecContext *avctx) static void decode_flush(AVCodecContext *avctx)
{ {
KgvContext * const c = avctx->priv_data; 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, 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; return res;
if (w != avctx->width || h != avctx->height) { if (w != avctx->width || h != avctx->height) {
av_frame_unref(&c->prev); av_frame_unref(c->prev);
avcodec_set_dimensions(avctx, w, h); 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) if ((res = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0)
return res; return res;
out = frame->data[0]; out = frame->data[0];
if (c->prev.data[0]) { if (c->prev->data[0]) {
prev = c->prev.data[0]; prev = c->prev->data[0];
} else { } else {
prev = NULL; prev = NULL;
} }
@ -145,8 +145,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
if (outcnt - maxcnt) if (outcnt - maxcnt)
av_log(avctx, AV_LOG_DEBUG, "frame finished with %d diff\n", outcnt - maxcnt); av_log(avctx, AV_LOG_DEBUG, "frame finished with %d diff\n", outcnt - maxcnt);
av_frame_unref(&c->prev); av_frame_unref(c->prev);
if ((res = av_frame_ref(&c->prev, frame)) < 0) if ((res = av_frame_ref(c->prev, frame)) < 0)
return res; return res;
*got_frame = 1; *got_frame = 1;
@ -162,12 +162,17 @@ static av_cold int decode_init(AVCodecContext *avctx)
avctx->pix_fmt = AV_PIX_FMT_RGB555; avctx->pix_fmt = AV_PIX_FMT_RGB555;
avctx->flags |= CODEC_FLAG_EMU_EDGE; avctx->flags |= CODEC_FLAG_EMU_EDGE;
c->prev = av_frame_alloc();
if (!c->prev)
return AVERROR(ENOMEM);
return 0; return 0;
} }
static av_cold int decode_end(AVCodecContext *avctx) static av_cold int decode_end(AVCodecContext *avctx)
{ {
decode_flush(avctx); KgvContext * const c = avctx->priv_data;
av_frame_free(&c->prev);
return 0; return 0;
} }