virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avcodec/fic: Postpone duplicating AVFrame buffer

Browse Source 
This avoids duplicating the AVFrames in case of skip frames
or in case of errors.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2025-06-23 04:51:08 +02:00
parent 45920251d9
commit e813e1e940
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/fic.c
View File

@ -282,9 +282,6 @@ static int fic_decode_frame(AVCodecContext *avctx, AVFrame *rframe,
int skip_cursor = ctx->skip_cursor; int skip_cursor = ctx->skip_cursor;
const uint8_t *sdata; const uint8_t *sdata;
if ((ret = ff_reget_buffer(avctx, ctx->frame, 0)) < 0)
return ret;
/* Header + at least one slice (4) */ /* Header + at least one slice (4) */
if (avpkt->size < FIC_HEADER_SIZE + 4) { if (avpkt->size < FIC_HEADER_SIZE + 4) {
av_log(avctx, AV_LOG_ERROR, "Frame data is too small.\n"); 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; 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, if ((ret = avctx->execute(avctx, fic_decode_slice, ctx->slice_data,
NULL, nslices, sizeof(ctx->slice_data[0]))) < 0) NULL, nslices, sizeof(ctx->slice_data[0]))) < 0)
return ret; return ret;