Changeset 1413 in 3DVCSoftware for trunk/source/Lib/TLibCommon/Debug.cpp

Timestamp:

11 Jul 2018, 15:19:49 (7 years ago)

Author:

tech

Message:

Merged HTM-16.2-dev@1412

File:

• trunk/source/Lib/TLibCommon/Debug.cpp (modified) (2 diffs)

trunk/source/Lib/TLibCommon/Debug.cpp

@@ -4 +4 @@
  * granted under this license.
  *
- * Copyright (c) 2010-2016, ITU/ISO/IEC
+ * Copyright (c) 2010-2017, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -180 +180 @@
 
   PRINT_CONSTANT(ME_ENABLE_ROUNDING_OF_MVS,                                         settingNameWidth, settingValueWidth);
-  PRINT_CONSTANT(U0040_MODIFIED_WEIGHTEDPREDICTION_WITH_BIPRED_AND_CLIPPING,        settingNameWidth, settingValueWidth);
+#if NH_MV
+  PRINT_CONSTANT(NH_MV_ALLOW_NON_CONFORMING,                                        settingNameWidth, settingValueWidth);
+#endif
 
   //------------------------------------------------