Changeset 769 in 3DVCSoftware for branches/HTM-9.2-dev0/source/Lib/TLibEncoder/TEncCu.cpp

Timestamp:

13 Jan 2014, 08:05:57 (10 years ago)

Author:

tech

Message:

Further fixes.

File:

• branches/HTM-9.2-dev0/source/Lib/TLibEncoder/TEncCu.cpp (modified) (2 diffs)

branches/HTM-9.2-dev0/source/Lib/TLibEncoder/TEncCu.cpp

@@ -1796 +1796 @@
 #endif
 #else
+#if H_3D
   rpcTempCU->m_bAvailableFlagA1 = 0;
   rpcTempCU->m_bAvailableFlagB1 = 0;
@@ -1803 +1804 @@
   rpcTempCU->getInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand );
   rpcTempCU->xGetInterMergeCandidates( 0, 0, cMvFieldNeighbours,uhInterDirNeighbours, numValidMergeCand );
+#else
+  rpcTempCU->getInterMergeCandidates( 0, 0, cMvFieldNeighbours,uhInterDirNeighbours, numValidMergeCand );
+#endif
 #endif