This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch release/7.1 in repository ffmpeg.
commit 78eabd954e7f9cef399644ed2afb9b5484890b96 Author: Nuo Mi <[email protected]> AuthorDate: Sat Nov 23 17:32:35 2024 +0800 Commit: Frank Plowman <[email protected]> CommitDate: Wed Jun 10 15:12:20 2026 +0100 avcodec/vvcdec: inter_data, check the return value from hls_merge_data Reported-by: Frank Plowman <[email protected]> (cherry picked from commit ba89c5b989938fad751ac451d1f6ef813bb42460) --- libavcodec/vvc/ctu.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/vvc/ctu.c b/libavcodec/vvc/ctu.c index b33ad576cf..634c553814 100644 --- a/libavcodec/vvc/ctu.c +++ b/libavcodec/vvc/ctu.c @@ -1778,13 +1778,16 @@ static int inter_data(VVCLocalContext *lc) pu->general_merge_flag = ff_vvc_general_merge_flag(lc); if (pu->general_merge_flag) { - hls_merge_data(lc); + ret = hls_merge_data(lc); } else if (cu->pred_mode == MODE_IBC){ ret = mvp_data_ibc(lc); } else { ret = mvp_data(lc); } + if (ret) + return ret; + if (cu->pred_mode == MODE_IBC) { ff_vvc_update_hmvp(lc, mi); _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
