# Conflicts:
#	source/Lib/DecoderLib/CABACReader.cpp
#	source/Lib/EncoderLib/CABACWriter.cpp
#	source/Lib/EncoderLib/EncCu.cpp

Add a cfg option "FastIntraPass", and use it for turning on/off the fast algorithm of intra pass coding in RDO. In cfg files, the parameter FastIntraPass is set as 0 for RA and 1 for LDB/LDP.

JVET-O1153: intra chroma mode coding simplification

See merge request jvet/VVCSoftware_VTM!766

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

JVET-O0213: Block size restriction of LFNST to maximum transform size

See merge request jvet/VVCSoftware_VTM!765

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

JVET-O0244: weighted prediction in SPS and delta POC for reference pictures

See merge request jvet/VVCSoftware_VTM!761

JVET-O0060 4x4 deblocking

See merge request jvet/VVCSoftware_VTM!751

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

JVET-O0263/O0220-method 2: Syntax cleanup on subblock merge

See merge request jvet/VVCSoftware_VTM!748

JVET-O0057: Switchable interpolation filter

See merge request jvet/VVCSoftware_VTM!732

JVET-O0249: merge syntax change

See merge request jvet/VVCSoftware_VTM!745

- Macro: JVET_O0213_RESTRICT_LFNST_TO_MAX_TB_SIZE
- Restriction of LFNST to be applied up-to max. TB size

fix missed syntax change in xCalcPuMeBits

JVET-O0432: update LMCS encoder parameters in nonCTC cfg files

See merge request jvet/VVCSoftware_VTM!760

Merge branch 'master' of https://vcgit.hhi.fraunhofer.de/jvet/VVCSoftware_VTM into JVET_O0244_DELTA_POC

JVET-O0681: disable BCW for CIIP, method 2 inherit BCW index

See merge request jvet/VVCSoftware_VTM!743

JVET-O0220 method-1: Parse merge_subblock_flag conditioned on MaxNumSubblockMergeCand

See merge request !754

JVET-O0409: exclude coded_subblock_flag from counting context-coded bins in transform skip

See merge request jvet/VVCSoftware_VTM!723

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

# Conflicts:
#	source/Lib/DecoderLib/CABACReader.cpp
#	source/Lib/EncoderLib/CABACWriter.cpp
#	source/Lib/EncoderLib/EncCu.cpp