virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-06-30 22:24:04 +02:00
Code Issues Releases Activity

avcodec/vvcdec: misc, reformat inter_data()

Browse Source
This commit is contained in:
Nuo Mi
2024-11-23 17:32:36 +08:00
parent ba89c5b989
commit 4ec767abcc
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/vvc/ctu.c
View File

@ -1779,7 +1779,7 @@ static int inter_data(VVCLocalContext *lc)
if (pu->general_merge_flag) { if (pu->general_merge_flag) {
ret = hls_merge_data(lc); ret = hls_merge_data(lc);
} else if (cu->pred_mode == MODE_IBC){ } else if (cu->pred_mode == MODE_IBC) {
ret = mvp_data_ibc(lc); ret = mvp_data_ibc(lc);
} else { } else {
ret = mvp_data(lc); ret = mvp_data(lc);
@ -1788,8 +1788,7 @@ static int inter_data(VVCLocalContext *lc)
if (ret) if (ret)
return ret; return ret;
if (cu->pred_mode == MODE_IBC) if (cu->pred_mode == MODE_IBC) {
{
ff_vvc_update_hmvp(lc, mi); ff_vvc_update_hmvp(lc, mi);
} else if (!pu->merge_gpm_flag && !pu->inter_affine_flag && !pu->merge_subblock_flag) { } else if (!pu->merge_gpm_flag && !pu->inter_affine_flag && !pu->merge_subblock_flag) {
refine_regular_subblock(lc); refine_regular_subblock(lc);