Reported-by: Frank Plowman <p...@frankplowman.com>
---
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 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);
--
2.34.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
