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

Timestamp:

5 Jul 2014, 09:11:50 (10 years ago)

Author:

tech

Message:

Cleanup part 2.

File:

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

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

@@ -1815 +1815 @@
     rpcTempCU->getInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand );
     rpcTempCU->xGetInterMergeCandidates( 0, 0, cMvFieldNeighbours,uhInterDirNeighbours
-#if !ETRIKHU_CLEANUP_H0083
-      , vspFlag
-#endif
       , inheritedVSPDisInfo
 #if H_3D_SPIVMP
-#if !ETRIKHU_CLEANUP_H0083_MISSING
-      , bSPIVMPFlag
-#endif
       , pcMvFieldSP, puhInterDirSP
 #endif
@@ -1828 +1822 @@
       );
 
-#if ETRIKHU_CLEANUP_H0083
     rpcTempCU->buildMCL( cMvFieldNeighbours,uhInterDirNeighbours, vspFlag
 #if H_3D_SPIVMP
@@ -1835 +1828 @@
       , numValidMergeCand 
       );
-#endif
 
 #else