Changeset 422 in 3DVCSoftware for branches/HTM-6.2-dev2-MERL/source/Lib/TLibCommon/TComDataCU.cpp

Timestamp:

20 May 2013, 01:51:15 (12 years ago)

Author:

mitsubishi-htm

Message:

-macro updates.

File:

• branches/HTM-6.2-dev2-MERL/source/Lib/TLibCommon/TComDataCU.cpp (modified) (3 diffs)

branches/HTM-6.2-dev2-MERL/source/Lib/TLibCommon/TComDataCU.cpp

@@ -3862 +3862 @@
       cDisInfo.m_acMvCandNoRef[0] = getDvInfo(uiAbsPartIdx).m_acMvCandNoRef[0];
 #endif
+#if MERL_General_Fix
 #if MERL_VSP_C0152
 #if MERL_VSP_NBDV_RefVId_Fix_D0166
       cDisInfo.m_aListIdx[0] = getDvInfo(uiAbsPartIdx).m_aListIdx[0];
       cDisInfo.m_aRefIdx[0]  = getDvInfo(uiAbsPartIdx).m_aRefIdx[0];
+#endif
 #endif
 #endif
@@ -5380 +5382 @@
 
           TComPic* picDepth = NULL;
+#if MERL_General_Fix
 #if MERL_VSP_C0152
 #if MERL_VSP_NBDV_RefVId_Fix_D0166
@@ -5388 +5391 @@
 #else
           picDepth = getSlice()->getRefPicBaseDepth();
+#endif
 #endif
 #endif