Changeset 1270 in 3DVCSoftware for branches/HTM-14.1-update-dev3/source/Lib/TLibCommon/CommonDef.h

Timestamp:

13 Jul 2015, 15:22:02 (10 years ago)

Author:

tech

Message:

Merged 14.1-update-dev4-Qualcomm@1266

File:

• branches/HTM-14.1-update-dev3/source/Lib/TLibCommon/CommonDef.h (modified) (1 diff)

branches/HTM-14.1-update-dev3/source/Lib/TLibCommon/CommonDef.h

@@ -363 +363 @@
 #endif
 
-#if NH_3D_MLC
+#if NH_3D_MLC  || NH_3D_ARP
 #define MRG_MAX_NUM_CANDS_MEM       (MRG_MAX_NUM_CANDS+1) // one extra for inter-view motion prediction
 #endif