Changeset 1274 in 3DVCSoftware for branches/HTM-14.1-update-dev2/source/Lib/TLibEncoder/TEncSearch.h

Timestamp:

14 Jul 2015, 12:31:09 (9 years ago)

Author:

tech

Message:

Merged HTM-14.1-update-dev3@1273.

File:

• branches/HTM-14.1-update-dev2/source/Lib/TLibEncoder/TEncSearch.h (modified) (1 diff)

branches/HTM-14.1-update-dev2/source/Lib/TLibEncoder/TEncSearch.h

@@ -409 +409 @@
                                     TComMvField* cMvFieldNeighbours,
                                     UChar*       uhInterDirNeighbours,
-#if H_3D_VSP
+                                    Int&         numValidMergeCand
+#if NH_3D_VSP
                                   , Int* vspFlag
 #endif
-#if H_3D_SPIVMP
+#if NH_3D_SPIVMP
                                   , Bool* pbSPIVMPFlag, TComMvField* pcMvFieldSP, UChar* puhInterDirSP
 #endif
-                                    Int&         numValidMergeCand
                                    );