ffmpeg | branch: master | Frank Plowman <p...@frankplowman.com> | Sat May 31 21:58:53 2025 +0100| [81370fd796d7259ea55a806039e5db3912ad1248] | committer: Nuo Mi
lavc/vvc: Fix unchecked return code and shadowing Signed-off-by: Frank Plowman <p...@frankplowman.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=81370fd796d7259ea55a806039e5db3912ad1248 --- libavcodec/vvc/dec.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavcodec/vvc/dec.c b/libavcodec/vvc/dec.c index 381b42c421..aba31b94fe 100644 --- a/libavcodec/vvc/dec.c +++ b/libavcodec/vvc/dec.c @@ -1077,7 +1077,7 @@ fail: static int frame_end(VVCContext *s, VVCFrameContext *fc) { const AVFilmGrainParams *fgp; - int ret = 0; + int ret; if (fc->ref->needs_fg) { av_assert0(fc->ref->frame_grain->buf[0]); @@ -1089,9 +1089,13 @@ static int frame_end(VVCContext *s, VVCFrameContext *fc) case AV_FILM_GRAIN_PARAMS_H274: ret = ff_h274_apply_film_grain(fc->ref->frame_grain, fc->ref->frame, &s->h274db, fgp); + if (ret < 0) + return ret; break; case AV_FILM_GRAIN_PARAMS_AV1: ret = ff_aom_apply_film_grain(fc->ref->frame_grain, fc->ref->frame, fgp); + if (ret < 0) + return ret; break; } } @@ -1099,7 +1103,7 @@ static int frame_end(VVCContext *s, VVCFrameContext *fc) if (!s->avctx->hwaccel && s->avctx->err_recognition & AV_EF_CRCCHECK) { VVCSEI *sei = &fc->sei; if (sei->picture_hash.present) { - int ret = ff_h274_hash_init(&s->hash_ctx, sei->picture_hash.hash_type); + ret = ff_h274_hash_init(&s->hash_ctx, sei->picture_hash.hash_type); if (ret < 0) return ret; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
