Changeset 185 in 3DVCSoftware for branches/HTM-4.1-dev0/source/Lib/TLibCommon/CommonDef.h

Timestamp:

14 Nov 2012, 20:45:12 (12 years ago)

Author:

tech

Message:

Reintegrated /branches/HTM-4.1-dev1-HHI rev. 176.

File:

• branches/HTM-4.1-dev0/source/Lib/TLibCommon/CommonDef.h (modified) (1 diff)

branches/HTM-4.1-dev0/source/Lib/TLibCommon/CommonDef.h

@@ -139 +139 @@
 #define PDM_NO_INTER_UPDATE               1         // no update for inter (but not inter-view) predicted blocks
 #define PDM_MERGE_POS                     0         // position of pdm in merge list (0..4)
+
+#if QC_MRG_CANS_B0048
+#if OL_DISMV_POS_B0069
+#define DMV_MERGE_POS                     4
+#else
+#define DMV_MERGE_POS                     1
+#endif
+#endif
+
 #if SAIT_IMPROV_MOTION_PRED_M24829&!QC_MULTI_DIS_CAN
 #define PDM_AMVP_POS                      0         // position of pdm in amvp list  (0..3)