remove JVET_L_AFFINE

source/Lib/CommonLib/TypeDef.h

@@ -91,12 +91,11 @@
 
 #define JVET_L0628_4TAP_INTRA                             1 // 4-tap intra-interpolation filtering with switching between Gaussian and DCT-IF filters for luma component
 
-#define JVET_L_AFFINE                                     1
-#if JVET_L_AFFINE
 #define JVET_L0271_AFFINE_AMVP_SIMPLIFY                   1 // Simplification of affine AMVP list construction
 #define JVET_L0694_AFFINE_LINEBUFFER_CLEANUP              1 // Combination of affine mode clean up and line buffer reduction
 #define JVET_L0632_AFFINE_MERGE                           1 // Affine merge list construction
-#define JVET_L0369_SUBBLOCK_MERGE                         1 // Moving ATMVP into the affine merge list
+#if JVET_L0632_AFFINE_MERGE
+#define JVET_L0369_SUBBLOCK_MERGE                         1 // Moving ATMVP into the sub-block merge list
 #endif
 
 #define REUSE_CU_RESULTS                                  1