From 09a22d73449cf6498b8af8ed0cec78aeef2ba05a Mon Sep 17 00:00:00 2001 From: Frank Bossen <frank@bossentech.com> Date: Tue, 20 Nov 2018 22:18:27 +0100 Subject: [PATCH] Revert "Merge branch 'fix_mergeListSize' into 'master'" This reverts merge request !105 --- cfg/encoder_intra_vtm.cfg | 2 +- cfg/encoder_lowdelay_P_vtm.cfg | 2 +- cfg/encoder_lowdelay_vtm.cfg | 2 +- cfg/encoder_randomaccess_vtm.cfg | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cfg/encoder_intra_vtm.cfg b/cfg/encoder_intra_vtm.cfg index 64f497115..100dc175b 100644 --- a/cfg/encoder_intra_vtm.cfg +++ b/cfg/encoder_intra_vtm.cfg @@ -106,7 +106,7 @@ EMT : 1 EMTFast : 1 Affine : 1 SubPuMvp : 1 -MaxNumMergeCand : 5 +MaxNumMergeCand : 6 LMChroma : 1 # use CCLM only DepQuant : 1 IMV : 2 diff --git a/cfg/encoder_lowdelay_P_vtm.cfg b/cfg/encoder_lowdelay_P_vtm.cfg index 2d823be28..60efe6071 100644 --- a/cfg/encoder_lowdelay_P_vtm.cfg +++ b/cfg/encoder_lowdelay_P_vtm.cfg @@ -122,7 +122,7 @@ EMT : 1 EMTFast : 1 Affine : 1 SubPuMvp : 1 -MaxNumMergeCand : 5 +MaxNumMergeCand : 6 LMChroma : 1 # use CCLM only DepQuant : 1 IMV : 2 diff --git a/cfg/encoder_lowdelay_vtm.cfg b/cfg/encoder_lowdelay_vtm.cfg index 2a4bb97a5..9612eadad 100644 --- a/cfg/encoder_lowdelay_vtm.cfg +++ b/cfg/encoder_lowdelay_vtm.cfg @@ -122,7 +122,7 @@ EMT : 1 EMTFast : 1 Affine : 1 SubPuMvp : 1 -MaxNumMergeCand : 5 +MaxNumMergeCand : 6 LMChroma : 1 # use CCLM only DepQuant : 1 IMV : 2 diff --git a/cfg/encoder_randomaccess_vtm.cfg b/cfg/encoder_randomaccess_vtm.cfg index ca25bfea2..8dbf07b89 100644 --- a/cfg/encoder_randomaccess_vtm.cfg +++ b/cfg/encoder_randomaccess_vtm.cfg @@ -136,7 +136,7 @@ EMT : 1 EMTFast : 1 Affine : 1 SubPuMvp : 1 -MaxNumMergeCand : 5 +MaxNumMergeCand : 6 LMChroma : 1 # use CCLM only DepQuant : 1 IMV : 2 -- GitLab