Unified · Split
| @@ -1778,13 +1778,16 @@ static int inter_data(VVCLocalContext *lc) · 1777 unmodified lines | |||
| 1778 | pu->general_merge_flag = ff_vvc_general_merge_flag(lc); | 1778 | pu->general_merge_flag = ff_vvc_general_merge_flag(lc); |
| 1779 | 1779 | ||
| 1780 | if (pu->general_merge_flag) { | 1780 | if (pu->general_merge_flag) { |
| 1781 | hls_merge_data(lc); | 1781 | ret = hls_merge_data(lc); |
| 1782 | } else if (cu->pred_mode == MODE_IBC){ | 1782 | } else if (cu->pred_mode == MODE_IBC){ |
| 1783 | ret = mvp_data_ibc(lc); | 1783 | ret = mvp_data_ibc(lc); |
| 1784 | } else { | 1784 | } else { |
| 1785 | ret = mvp_data(lc); | 1785 | ret = mvp_data(lc); |
| 1786 | } | 1786 | } |
| 1787 | 1787 | ||
| 1788 | if (ret) | ||
| 1789 | return ret; | ||
| 1790 | |||
| 1788 | if (cu->pred_mode == MODE_IBC) | 1791 | if (cu->pred_mode == MODE_IBC) |
| 1789 | { | 1792 | { |
| 1790 | ff_vvc_update_hmvp(lc, mi); | 1793 | ff_vvc_update_hmvp(lc, mi); |