diff options
Diffstat (limited to 'libavcodec/indeo3.c')
-rw-r--r-- | libavcodec/indeo3.c | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/libavcodec/indeo3.c b/libavcodec/indeo3.c index a94b087bed..fd302a76da 100644 --- a/libavcodec/indeo3.c +++ b/libavcodec/indeo3.c @@ -82,7 +82,6 @@ typedef struct Cell { typedef struct Indeo3DecodeContext { AVCodecContext *avctx; - AVFrame frame; DSPContext dsp; GetBitContext gb; @@ -1048,7 +1047,6 @@ static av_cold int decode_init(AVCodecContext *avctx) ctx->avctx = avctx; avctx->pix_fmt = AV_PIX_FMT_YUV410P; - avcodec_get_frame_defaults(&ctx->frame); build_requant_tab(); @@ -1064,6 +1062,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, Indeo3DecodeContext *ctx = avctx->priv_data; const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; + AVFrame *frame = data; int res; res = decode_frame_headers(ctx, avctx, buf, buf_size); @@ -1089,11 +1088,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, /* use BS_BUFFER flag for buffer switching */ ctx->buf_sel = (ctx->frame_flags >> BS_BUFFER) & 1; - if (ctx->frame.data[0]) - avctx->release_buffer(avctx, &ctx->frame); - - ctx->frame.reference = 0; - if ((res = ff_get_buffer(avctx, &ctx->frame)) < 0) { + if ((res = ff_get_buffer(avctx, frame, 0)) < 0) { av_log(ctx->avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return res; } @@ -1110,17 +1105,16 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, return res; output_plane(&ctx->planes[0], ctx->buf_sel, - ctx->frame.data[0], ctx->frame.linesize[0], + frame->data[0], frame->linesize[0], avctx->height); output_plane(&ctx->planes[1], ctx->buf_sel, - ctx->frame.data[1], ctx->frame.linesize[1], + frame->data[1], frame->linesize[1], (avctx->height + 3) >> 2); output_plane(&ctx->planes[2], ctx->buf_sel, - ctx->frame.data[2], ctx->frame.linesize[2], + frame->data[2], frame->linesize[2], (avctx->height + 3) >> 2); *got_frame = 1; - *(AVFrame*)data = ctx->frame; return buf_size; } @@ -1128,13 +1122,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, static av_cold int decode_close(AVCodecContext *avctx) { - Indeo3DecodeContext *ctx = avctx->priv_data; - free_frame_buffers(avctx->priv_data); - if (ctx->frame.data[0]) - avctx->release_buffer(avctx, &ctx->frame); - return 0; } |