Changeset 1029 in 3DVCSoftware for branches/HTM-11.2-dev0/source/Lib/TLibCommon/TComDataCU.h

Timestamp:

30 Jul 2014, 18:43:21 (10 years ago)

Author:

tech

Message:

Merged 11.2-dev1-MediaTek@1004.

File:

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

branches/HTM-11.2-dev0/source/Lib/TLibCommon/TComDataCU.h

@@ -250 +250 @@
 #if H_3D_IV_MERGE
   Bool          xAddIvMRGCand( Int mrgCandIdx, Int& iCount, Int*   ivCandDir, TComMv* ivCandMv, Int* ivCandRefIdx ); 
+#if! SEC_SIMP_SHIFTED_DV_I0086
   Bool          xGetPosFirstAvailDmvCand( Int iCount, Int& iFirDispCand );
+#endif
 #endif