From ae17e79169b5af0e18f2853130dbc65d881edab1 Mon Sep 17 00:00:00 2001
From: Frank Bossen <fbossen@gmail.com>
Date: Thu, 29 Apr 2021 11:16:32 -0400
Subject: [PATCH] Move macro definitions into correct place

---
 source/Lib/CommonLib/TypeDef.h | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 2e87c6fb5..8199ea158 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -51,8 +51,18 @@
 #include <cassert>
 
 
+// clang-format off
+
+//########### place macros to be removed in next cycle below this line ###############
 #define PRINT_WPSNR 1
 
+#define JVET_U0081                                        1 // ALF filter strength target
+
+#define JVET_U0103_HIGH_BIT_DEPTH_SIMD                    1 // JVET-U0103: SIMD implementation for high bit depth coding
+
+#define JVET_S0078_NOOUTPUTPRIORPICFLAG                   0 // JVET-S0078: Handling of NoOutputOfPriorPicsFlag in output process
+
+//########### place macros to be be kept below this line ###############
 #define GDR_ENABLED   1
 
 #if GDR_ENABLED
@@ -61,16 +71,6 @@
 #define GDR_DEC_TRACE  0
 #endif
 
-// clang-format off
-
-#define JVET_U0081                                        1 // ALF filter strength target
-
-//########### place macros to be removed in next cycle below this line ###############
-#define JVET_U0103_HIGH_BIT_DEPTH_SIMD                    1 // JVET-U0103: SIMD implementation for high bit depth coding
-
-#define JVET_S0078_NOOUTPUTPRIORPICFLAG                   0 // JVET-S0078: Handling of NoOutputOfPriorPicsFlag in output process
-
-//########### place macros to be be kept below this line ###############
 #define JVET_S0257_DUMP_360SEI_MESSAGE                    1 // Software support of 360 SEI messages
 
 #define JVET_R0351_HIGH_BIT_DEPTH_ENABLED                 0 // JVET-R0351: high bit depth coding enabled (increases accuracies of some calculations, e.g. transforms)
-- 
GitLab