aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNuo Mi <nuomi2021@gmail.com>2024-11-23 17:32:35 +0800
committerNuo Mi <nuomi2021@gmail.com>2024-11-30 09:58:59 +0800
commitba89c5b989938fad751ac451d1f6ef813bb42460 (patch)
tree3bc2e2f7e546fe2fe4d5d62d6b17254ba841271b
parent98698ed3c24bfd0b1e6e6db943b5f25f6046cee7 (diff)
downloadffmpeg-ba89c5b989938fad751ac451d1f6ef813bb42460.tar.gz
avcodec/vvcdec: inter_data, check the return value from hls_merge_data
Reported-by: Frank Plowman <post@frankplowman.com>
-rw-r--r--libavcodec/vvc/ctu.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/vvc/ctu.c b/libavcodec/vvc/ctu.c
index 1e06119cfd..6c0c52b836 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);