Changeset 420 in 3DVCSoftware for branches/HTM-6.2-dev2-MERL/source/Lib/TLibCommon/TComPrediction.h

Timestamp:

19 May 2013, 19:30:56 (12 years ago)

Author:

mitsubishi-htm

Message:

-macro updates.

File:

• branches/HTM-6.2-dev2-MERL/source/Lib/TLibCommon/TComPrediction.h (modified) (1 diff)

branches/HTM-6.2-dev2-MERL/source/Lib/TLibCommon/TComPrediction.h

@@ -153 +153 @@
 #endif
 #if MERL_VSP_C0152
-  Void xPredInterVSPBlk(TComDataCU* pcCU, UInt uiPartAddr, UInt uiAbsPartIdx, Int iWidth, Int iHeight, TComMv cMv, RefPicList eRefPicList, TComYuv*& rpcYuvPred, Bool bi );
+  Void xPredInterVSPBlk(TComDataCU* pcCU, UInt uiPartAddr, UInt uiAbsPartIdx, Int iWidth, Int iHeight, TComMv cMv, RefPicList eRefPicList, TComYuv*& rpcYuvPred, Bool bi 
+#if !MERL_Bi_VSP_D0166
+                                     , Int vspIdx
+#endif
+    );
 #if MERL_Bi_VSP_D0166
   TComPic*  xGetVspRefTxt(TComDataCU* pcCU, UInt uiPartAddr, RefPicList eRefPicList);