virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

lavc/gifdec: unify get_buffer() calls I/P frames

Browse Source 
Always call ff_reget_buffer(), which ensures that get_buffer2() is
called with AV_GET_BUFFER_FLAG_REF.

Fixes #10460.
This commit is contained in:
Anton Khirnov
2023-07-11 19:12:23 +02:00
committed by Paul B Mahol
parent acde0ae6c7
commit 891167dee5
1 changed files with 12 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
libavcodec/gifdec.c
View File

@@ -489,42 +489,29 @@ static int gif_decode_frame(AVCodecContext *avctx, AVFrame *rframe,
return ret; return ret;
av_frame_unref(s->frame); av_frame_unref(s->frame);
if ((ret = ff_get_buffer(avctx, s->frame, 0)) < 0)
return ret;
av_fast_malloc(&s->idx_line, &s->idx_line_size, s->screen_width); av_fast_malloc(&s->idx_line, &s->idx_line_size, s->screen_width);
if (!s->idx_line) if (!s->idx_line)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} else if (!s->keyframe_ok) {
s->frame->pict_type = AV_PICTURE_TYPE_I;
s->frame->flags |= AV_FRAME_FLAG_KEY;
s->keyframe_ok = 1;
} else {
if (!s->keyframe_ok) {
av_log(avctx, AV_LOG_ERROR, "cannot decode frame without keyframe\n"); av_log(avctx, AV_LOG_ERROR, "cannot decode frame without keyframe\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if ((ret = ff_reget_buffer(avctx, s->frame, 0)) < 0) ret = ff_reget_buffer(avctx, s->frame, 0);
if (ret < 0)
return ret; return ret;
s->frame->pict_type = AV_PICTURE_TYPE_P;
s->frame->flags &= ~AV_FRAME_FLAG_KEY;
}
ret = gif_parse_next_image(s, s->frame); ret = gif_parse_next_image(s, s->frame);
if (ret < 0) if (ret < 0)
return ret; return ret;
if ((ret = av_frame_ref(rframe, s->frame)) < 0) if ((ret = av_frame_ref(rframe, s->frame)) < 0)
return ret; return ret;
if (s->keyframe) {
rframe->pict_type = AV_PICTURE_TYPE_I; rframe->pict_type = s->keyframe ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P;
rframe->flags |= AV_FRAME_FLAG_KEY; rframe->flags = AV_FRAME_FLAG_KEY * s->keyframe;
} else { s->keyframe_ok |= !!s->keyframe;
rframe->pict_type = AV_PICTURE_TYPE_P;
rframe->flags &= ~AV_FRAME_FLAG_KEY;
}
*got_frame = 1; *got_frame = 1;
return bytestream2_tell(&s->gb); return bytestream2_tell(&s->gb);