From 7be1a0ed9e382a8642e914c96abc14594095bf9f Mon Sep 17 00:00:00 2001
From: Huanbang Chen <chenhuanbang@huawei.com>
Date: Tue, 30 Oct 2018 15:43:50 +0800
Subject: [PATCH] remove JVET_L_AFFINE

---
 source/Lib/CommonLib/TypeDef.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 4710332e..379c4b27 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/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
-- 
GitLab