Commit d6f96108 authored by Michael Niedermayer's avatar Michael Niedermayer

yop: use reget_buffer() as the previous contents are used

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 7239b360
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
typedef struct YopDecContext { typedef struct YopDecContext {
AVCodecContext *avctx; AVCodecContext *avctx;
AVFrame *frame;
int num_pal_colors; int num_pal_colors;
int first_color[2]; int first_color[2];
...@@ -78,6 +79,13 @@ static const int8_t motion_vector[16][2] = ...@@ -78,6 +79,13 @@ static const int8_t motion_vector[16][2] =
{ 4, -2}, {-2, 0}, { 4, -2}, {-2, 0},
}; };
static av_cold void yop_decode_close(AVCodecContext *avctx)
{
YopDecContext *s = avctx->priv_data;
av_frame_free(&s->frame);
}
static av_cold int yop_decode_init(AVCodecContext *avctx) static av_cold int yop_decode_init(AVCodecContext *avctx)
{ {
YopDecContext *s = avctx->priv_data; YopDecContext *s = avctx->priv_data;
...@@ -107,6 +115,8 @@ static av_cold int yop_decode_init(AVCodecContext *avctx) ...@@ -107,6 +115,8 @@ static av_cold int yop_decode_init(AVCodecContext *avctx)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
s->frame = av_frame_alloc();
return 0; return 0;
} }
...@@ -178,7 +188,7 @@ static int yop_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, ...@@ -178,7 +188,7 @@ static int yop_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
AVPacket *avpkt) AVPacket *avpkt)
{ {
YopDecContext *s = avctx->priv_data; YopDecContext *s = avctx->priv_data;
AVFrame *frame = data; AVFrame *frame = s->frame;
int tag, firstcolor, is_odd_frame; int tag, firstcolor, is_odd_frame;
int ret, i, x, y; int ret, i, x, y;
uint32_t *palette; uint32_t *palette;
...@@ -188,7 +198,7 @@ static int yop_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, ...@@ -188,7 +198,7 @@ static int yop_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) if ((ret = ff_reget_buffer(avctx, frame)) < 0)
return ret; return ret;
if (!avctx->frame_number) if (!avctx->frame_number)
...@@ -242,6 +252,9 @@ static int yop_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, ...@@ -242,6 +252,9 @@ static int yop_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
s->dstptr += 2*frame->linesize[0] - x; s->dstptr += 2*frame->linesize[0] - x;
} }
if ((ret = av_frame_ref(data, s->frame)) < 0)
return ret;
*got_frame = 1; *got_frame = 1;
return avpkt->size; return avpkt->size;
} }
...@@ -252,6 +265,7 @@ AVCodec ff_yop_decoder = { ...@@ -252,6 +265,7 @@ AVCodec ff_yop_decoder = {
.id = AV_CODEC_ID_YOP, .id = AV_CODEC_ID_YOP,
.priv_data_size = sizeof(YopDecContext), .priv_data_size = sizeof(YopDecContext),
.init = yop_decode_init, .init = yop_decode_init,
.close = yop_decode_close,
.decode = yop_decode_frame, .decode = yop_decode_frame,
.long_name = NULL_IF_CONFIG_SMALL("Psygnosis YOP Video"), .long_name = NULL_IF_CONFIG_SMALL("Psygnosis YOP Video"),
}; };
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment