# Conflicts:
#   cfg/encoder_lowdelay_P_vtm.cfg
#   cfg/encoder_lowdelay_vtm.cfg
#   cfg/encoder_randomaccess_vtm.cfg

JVET-O0304: Reduction of number of multiplications in BDOF

See merge request !713

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

JVET-O0455: Separate maximum number of IBC merge candidates from regular merge mode

See merge request !776

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

JVET-O0650 signal chroma qp mapping table

See merge request !772

Bugfix #403:wPSNR hex values not printed out per frame

See merge request !763

Indentation improvements

Intra prediction code cleanup

See merge request jvet/VVCSoftware_VTM!792

Remove superfluous clipping

See merge request !791

Clean up intra angular prediction code

See merge request jvet/VVCSoftware_VTM!787

Intra prediction code cleanup

See merge request !790

Move DPDC code for HOR/VER to xPredIntraAng function to be
consistent with other angular modes. This also avoids code
duplication by having the same PDPC code for HOR and VER modes.

Clipping is not required for the DC/Planar PDPC process since
the result is always within the valid range

Remove fields whRatio and hwRatio from the IntraPredParam
structure when JVET_O0364_PADDING is enabled as they may be needed
only once. When ratios are needed use logs, adds, and shifts
instead of divisions and multiplications.

Add initializer for angularScale when JVET_O0364_PDPC_ANGULAR is
enabled

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

JVET-O0640: Picture size constraint

See merge request !786

Merge branch 'O0640-Picture-Size-Constraint' of https://vcgit.hhi.fraunhofer.de/lphamvan/VVCSoftware_VTM into O0640-Picture-Size-Constraint

JVET-O0070: Prediction refinement with optical flow for affine mode (PROF)

See merge request !789