From bf6927c962d600251367eb0cb537e8632f2a1707 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Date: Mon, 23 Jun 2025 04:51:08 +0200 Subject: [PATCH 8/8] avcodec/fic: Postpone duplicating AVFrame buffer This avoids duplicating the AVFrames in case of skip frames or in case of errors. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/fic.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/fic.c b/libavcodec/fic.c index 47cfb6ae7e..b3468d751b 100644 --- a/libavcodec/fic.c +++ b/libavcodec/fic.c @@ -282,9 +282,6 @@ static int fic_decode_frame(AVCodecContext *avctx, AVFrame *rframe, int skip_cursor = ctx->skip_cursor; const uint8_t *sdata; - if ((ret = ff_reget_buffer(avctx, ctx->frame, 0)) < 0) - return ret; - /* Header + at least one slice (4) */ if (avpkt->size < FIC_HEADER_SIZE + 4) { av_log(avctx, AV_LOG_ERROR, "Frame data is too small.\n"); @@ -407,6 +404,9 @@ static int fic_decode_frame(AVCodecContext *avctx, AVFrame *rframe, ctx->slice_data[slice].y_off = y_off; } + if ((ret = ff_reget_buffer(avctx, ctx->frame, 0)) < 0) + return ret; + if ((ret = avctx->execute(avctx, fic_decode_slice, ctx->slice_data, NULL, nslices, sizeof(ctx->slice_data[0]))) < 0) return ret; -- 2.45.2