diff --git a/source/Lib/CommonLib/CommonDef.h b/source/Lib/CommonLib/CommonDef.h index 962f182ef71d418092e1325f0e6092bad34f8c0b..b9d6834f68e7992af31dd789f55fbc4671115d9d 100644 --- a/source/Lib/CommonLib/CommonDef.h +++ b/source/Lib/CommonLib/CommonDef.h @@ -1212,7 +1212,11 @@ static const int ADAPTIVE_SUB_GROUP_SIZE_MMVD_AFF = AF_MMVD_MAX_REFINE_NUM; #if JVET_AH0314_LIC_INHERITANCE_FOR_MRG static const int CFG_ALT_MRG_MAX_NUM_CANDS = 16; #if (JVET_Y0134_TMVP_NAMVP_CAND_REORDERING && JVET_W0090_ARMC_TM) || JVET_Z0075_IBC_HMVP_ENLARGE -static const int ALT_MRG_MAX_NUM_CANDS = std::min(CFG_ALT_MRG_MAX_NUM_CANDS, NUM_MERGE_CANDS); +#if CFG_ALT_MRG_MAX_NUM_CANDS <= NUM_MERGE_CANDS +static const int ALT_MRG_MAX_NUM_CANDS = CFG_ALT_MRG_MAX_NUM_CANDS; +#else +static const int ALT_MRG_MAX_NUM_CANDS = NUM_MERGE_CANDS; +#endif #else static const int ALT_MRG_MAX_NUM_CANDS = std::min(CFG_ALT_MRG_MAX_NUM_CANDS, MRG_MAX_NUM_CANDS); #endif