avcodec/vvcdec: inter_data, check the return value from hls_merge_data

Reported-by: Frank Plowman <post@frankplowman.com>
pull/391/head
Nuo Mi 2 months ago
parent 98698ed3c2
commit ba89c5b989
  1. 5
      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);

Loading…
Cancel
Save