Changeset 884 in 3DVCSoftware for trunk/source/Lib/TLibEncoder/TEncSearch.h

Timestamp:

29 Mar 2014, 18:55:16 (12 years ago)

Author:

tech

Message:

Merged HTM-10.1-dev0@883. (MV-HEVC 7 HLS)

File:

• trunk/source/Lib/TLibEncoder/TEncSearch.h (modified) (2 diffs)

trunk/source/Lib/TLibEncoder/TEncSearch.h

@@ -218 +218 @@
     TComYuv* pcResi, 
     TComYuv* pcRec, 
-#if SEC_INTER_SDC_G0101
     Int      uiOffset,
-#endif
     const UInt uiDepth );
 #endif
@@ -355 +353 @@
 #endif
 #if H_3D_DIM_SDC
-  Void xIntraCodingSDC            ( TComDataCU* pcCU, UInt uiAbsPartIdx, TComYuv* pcOrgYuv, TComYuv* pcPredYuv, Dist& ruiDist, Double& dRDCost, 
-#if QC_GENERIC_SDC_G0122
-    Bool bZeroResidual, Int iSDCDeltaResi
-#else
-    Bool bResidual
-#endif
-    );
+  Void xIntraCodingSDC            ( TComDataCU* pcCU, UInt uiAbsPartIdx, TComYuv* pcOrgYuv, TComYuv* pcPredYuv, Dist& ruiDist, Double& dRDCost, Bool bZeroResidual, Int iSDCDeltaResi    );
 #endif
 #endif