History

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

Nuo Mi committed 1 year ago

Commit ba89c5b1 parent 98698ed1 file · +4 −1Browse files

Unified · Split

libavcodec/vvc/ctu.c+4−1
@@ -1778,13 +1778,16 @@ static int inter_data(VVCLocalContext *lc) · 1777 unmodified lines
17781778 pu->general_merge_flag = ff_vvc_general_merge_flag(lc);
17791779
17801780 if (pu->general_merge_flag) {
1781− hls_merge_data(lc);
1781+ ret = hls_merge_data(lc);
17821782 } else if (cu->pred_mode == MODE_IBC){
17831783 ret = mvp_data_ibc(lc);
17841784 } else {
17851785 ret = mvp_data(lc);
17861786 }
17871787
1788+ if (ret)
1789+ return ret;
1790+
17881791 if (cu->pred_mode == MODE_IBC)
17891792 {
17901793 ff_vvc_update_hmvp(lc, mi);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t