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

1. enabling the encoder-side RD check of ISP mode when ACT is disabled at CU level
2. ACT intra RD code clean-up

Fix #648 : wrong block access in case of local dual tree in residual_lfnst_mode()

See merge request jvet/VVCSoftware_VTM!1107

add YAML file for GitLab CI integrated build process

See merge request jvet/VVCSoftware_VTM!1112

JVET-P0469: Coding delta_qp_diff_val instead of delta_qp_out_val

See merge request jvet/VVCSoftware_VTM!1103

JVET-P0445: sub-block merge encoder speedup

See merge request jvet/VVCSoftware_VTM!1067

AHG14 lossless encoder

See merge request jvet/VVCSoftware_VTM!1082

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

JVET-P1026: Combination of ISP and LFNST aspect

See merge request jvet/VVCSoftware_VTM!1106

Revert "Merge branch 'P0410-Chroma-QP-mapping' into 'master'"

See merge request jvet/VVCSoftware_VTM!1102

This reverts merge request !1101

JVET-P0410: Chroma QP Mapping table

See merge request jvet/VVCSoftware_VTM!1101

Fix JVET-P0371 chroma residuals scaling offset

See merge request jvet/VVCSoftware_VTM!1098

Fix for ticket #633: MIP encoding failure

See merge request jvet/VVCSoftware_VTM!1099

JVET-P0526: Palette encoder improvements

See merge request jvet/VVCSoftware_VTM!1081

Fix CHECK() statement

See merge request jvet/VVCSoftware_VTM!1100

- remove unnecessary checks, restrict Hadamard encoder search (non-normative, bit-identical for CTC)

Detail
- Fix the mis-alignment of rate and distortion during palette coding RD decision.
- Use different weights on luma component cost and chroma component cost.

JVET-P0059: Enable BDPCM for Chroma

See merge request jvet/VVCSoftware_VTM!1073

Enable BDPCM for Chroma for 444.

Fix parameter name in config file

See merge request jvet/VVCSoftware_VTM!1095

Looks like !1094 was not tested...

JVET-P0371: chroma residual scaling with offset

See merge request jvet/VVCSoftware_VTM!1094

Revert "Merge branch 'JVET-P0626' into 'master'"

See merge request jvet/VVCSoftware_VTM!1092