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

formatting: replace tab character by appropriate number of spaces

See merge request jvet/VVCSoftware_VTM!1152

Post-Fix #676: update R-D-cost lambda properly in case of perceptual QPA with base QP > 37

See merge request jvet/VVCSoftware_VTM!1148

JVET-P0217: PTL syntax cleanup

See merge request jvet/VVCSoftware_VTM!1143

remove duplicated code for JVET_P0205_VPS_ID_0

See merge request jvet/VVCSoftware_VTM!1151

PALETTE_BUFFER_REDUCTION: fix palette buffer issue

See merge request jvet/VVCSoftware_VTM!1110

use MAX_NUM_CHANNEL_TYPE instead of MAX_NUM_COMPONENT - 1

JVET-P0053/P0157/P0551: Applying ALF picture boundary padding to slice boundaries

See merge request jvet/VVCSoftware_VTM!1109

JVET-P0438: AHG17: On Constraints for ALF APS

See merge request jvet/VVCSoftware_VTM!1146

JVET-P0314: Apply three distinct flags in the PH (presence conditioned on SPS) for BDOF/DMVR/PROF

See merge request jvet/VVCSoftware_VTM!1025

Fix for #666 - Wrong QP and lambda clipping in rate control

See merge request jvet/VVCSoftware_VTM!1120

Change (0.1, 10000.0 * pow(2.0 , bitdepth_luma_scale)) to the variables encRCGOP::m_minEstLambda and encRCGOP::m_maxEstLambda.

Editorial: add note to suggested combination with LumaLevelToDeltaQPMode in PerceptQPA description in software manual

See merge request jvet/VVCSoftware_VTM!1145

Update low delay P configuration for LMCS to be consistent with low delay B configuration

See merge request jvet/VVCSoftware_VTM!1144

Fix#707: Align context index derivation of transform_skip_flag and mts_idx with WD

See merge request jvet/VVCSoftware_VTM!1135

Fix for #572: fix perceptual QP adaptation for unequal Cb and Cr QP offsets and in combination with JCCR

See merge request jvet/VVCSoftware_VTM!1058

same change made to encoder_lowdelay_P_vtm.cfg as done to encoder_lowdelay_vtm.cfg done in previous commit (LMCSOffset = 1), as LMCS tool off results for LDB and LDP are very similar.

new setting of LMCSOffset for cfg files encoder_intra_vtm.cfg and encoder_lowdelay_vtm.cfg

See merge request jvet/VVCSoftware_VTM!1142

JVET-P0517: Adaptive Color Transform

See merge request jvet/VVCSoftware_VTM!1054

Fix segmentation fault in xFlushPicture after 620d0a0f

See merge request jvet/VVCSoftware_VTM!1134