Merge branch 'JVET-M0839' into 'master'

JVET-M0839: increase number of SATD candidates in Affine Merge from 1 to 2

See merge request !206

source/Lib/CommonLib/CommonDef.h

@@ -367,7 +367,7 @@ static const int    FAST_SKIP_DEPTH =                               2;
 static const double PBINTRA_RATIO     =                             1.1;
 static const int    NUM_MRG_SATD_CAND =                             4;
 static const double MRG_FAST_RATIO    =                             1.25;
-static const int    NUM_AFF_MRG_SATD_CAND =                         1;
+static const int    NUM_AFF_MRG_SATD_CAND =                         2;
 
 static const double AMAXBT_TH32 =                                  15.0;
 static const double AMAXBT_TH64 =                                  30.0;