# Conflicts:
#	source/Lib/CommonLib/TypeDef.h

JVET-N0843 BV simplification

See merge request jvet/VVCSoftware_VTM!442

JVET-N0175/N0251/N0384: Re-arrange IBC search range for small CTU sizes

See merge request jvet/VVCSoftware_VTM!429

JVET-N0383/N0251: bug fix for ibc referring to collocated VPDU in left CTU

See merge request jvet/VVCSoftware_VTM!427

Fix encoding crash in JVET-N0329 integration

See merge request !435

JVET_N0318_N0467_IBC_SIZE

See merge request jvet/VVCSoftware_VTM!431

JVET-N0363: Modified cost criterion for intra encoder mode decision

See merge request jvet/VVCSoftware_VTM!418

Merge branch 'IBC-SMALL-CTU' of https://vcgit.hhi.fraunhofer.de/xiaozhongxu/VVCSoftware_VTM into IBC-SMALL-CTU

Implicitly infer the number of MMVD base merge candidate to be 1 as MaxNumMergeCand being equal to 1, and mmvd_merge_flag is not signalled in this case.

N0462: Fix context modeling of inter_pred_idc

See merge request jvet/VVCSoftware_VTM!428

JVET-N600: AMVR flag and Triangle flag context reduction

See merge request jvet/VVCSoftware_VTM!426

JVET-N0329: IBC Search Improvement

See merge request jvet/VVCSoftware_VTM!421

Merge branch 'JVET-N0286-simplified-GBiIdx' of https://vcgit.hhi.fraunhofer.de/fabrice.leleannec/VVCSoftware_VTM into JVET-N0286-simplified-GBiIdx

JVET-N0185: A Unified MPM List for Intra Mode Coding

See merge request !415

JVET-N0178 CE9-2.4 implicit BDOF split

See merge request jvet/VVCSoftware_VTM!412