Changeset 773 in 3DVCSoftware for trunk/source/Lib/TLibCommon/TComMotionInfo.cpp

Timestamp:

16 Jan 2014, 09:56:13 (10 years ago)

Author:

tech

Message:

Merged branch/9.2-dev0@722.

File:

• trunk/source/Lib/TLibCommon/TComMotionInfo.cpp (modified) (2 diffs)

trunk/source/Lib/TLibCommon/TComMotionInfo.cpp

@@ -40 +40 @@
 #include "assert.h"
 #include <stdlib.h>
-#if MTK_SPIVMP_F0110
+#if H_3D_SPIVMP
 #include "TComDataCU.h"
 #include "TComPic.h"
@@ -328 +328 @@
 }
 
-#if MTK_SPIVMP_F0110
+#if H_3D_SPIVMP
 Void TComCUMvField::setMvFieldSP( TComDataCU* pcCU, UInt uiAbsPartIdx, TComMvField cMvField, Int iWidth, Int iHeight  )
 {