Index: branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComDataCU.cpp
===================================================================
--- branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComDataCU.cpp	(revision 649)
+++ branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComDataCU.cpp	(revision 650)
@@ -5869,5 +5869,5 @@
 }
 #endif 
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
 Void 
 TComDataCU::getIVNStatus       ( UInt uiPartIdx,  DisInfo* pDInfo, Bool& bIVFMerge, Int& iIVFMaxD)
Index: branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComDataCU.h
===================================================================
--- branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComDataCU.h	(revision 649)
+++ branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibCommon/TComDataCU.h	(revision 650)
@@ -498,5 +498,5 @@
 #endif //H_3D_NBDV_REF
 #endif
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
   Void          getIVNStatus       ( UInt uiPartIdx,  DisInfo* pDInfo, Bool& bIVFMerge,  Int& iIVFMaxD);
 #endif
Index: branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibEncoder/TEncCu.cpp
===================================================================
--- branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibEncoder/TEncCu.cpp	(revision 649)
+++ branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibEncoder/TEncCu.cpp	(revision 650)
@@ -517,5 +517,5 @@
   if(!bSliceEnd && !bSliceStart && bInsidePicture )
   {
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
     Bool bIVFMerge = false;
     Int  iIVFMaxD = 0;
@@ -588,5 +588,5 @@
         }
       }
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
       if(rpcTempCU->getSlice()->getViewIndex() && !rpcTempCU->getSlice()->getIsDepth())
       {
@@ -612,5 +612,5 @@
           rpcTempCU->setICFlagSubParts(bICFlag, 0, 0, uiDepth);
 #endif
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
           xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_2Nx2N, bFMD );  rpcTempCU->initEstData( uiDepth, iQP );//by Competition for inter_2Nx2N
 #else
@@ -626,5 +626,5 @@
 #endif
         xCheckRDCostMerge2Nx2N( rpcBestCU, rpcTempCU, &earlyDetectionSkipMode );//by Merge for inter_2Nx2N
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
         bFMD = bIVFMerge && rpcBestCU->isSkipped(0);
 #endif
@@ -652,5 +652,5 @@
             rpcTempCU->setICFlagSubParts(bICFlag, 0, 0, uiDepth);
 #endif
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
             xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_2Nx2N, bFMD );  rpcTempCU->initEstData( uiDepth, iQP );
 #else
@@ -760,5 +760,5 @@
                 )
               {
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
                 xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_NxN, bFMD  );
 #else
@@ -780,5 +780,5 @@
             )
           {
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
             xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_Nx2N, bFMD  );
 #else
@@ -800,5 +800,5 @@
             )
           {
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
             xCheckRDCostInter      ( rpcBestCU, rpcTempCU, SIZE_2NxN, bFMD  );
 #else
@@ -839,5 +839,5 @@
                 )
               {
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
                 xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_2NxnU, bFMD );
 #else
@@ -859,5 +859,5 @@
                 )
               {
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
                 xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_2NxnD, bFMD );
 #else
@@ -883,5 +883,5 @@
                 )
               {
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
                 xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_2NxnU, bFMD, true );
 #else
@@ -903,5 +903,5 @@
                 )
               {
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
                 xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_2NxnD, bFMD, true );
 #else
@@ -929,5 +929,5 @@
                 )
               {
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
                 xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_nLx2N, bFMD );
 #else
@@ -949,5 +949,5 @@
                 )
               {
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
                 xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_nRx2N, bFMD );
 #else
@@ -969,5 +969,5 @@
                 )
               {
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
                 xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_nLx2N, bFMD, true );
 #else
@@ -989,5 +989,5 @@
                 )
               {
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
                 xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_nRx2N, bFMD, true );
 #else
@@ -1040,5 +1040,5 @@
 #endif
         }
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
         if(!bFMD)
         {
@@ -1122,5 +1122,5 @@
           }
         }
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
         }
 #endif
@@ -1167,5 +1167,5 @@
       bSubBranch = true;
     }
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
     if(rpcBestCU->getSlice()->getViewIndex() && !rpcBestCU->getSlice()->getIsDepth() && (uiDepth >=iIVFMaxD) && rpcBestCU->isSkipped(0))
     {
@@ -2044,5 +2044,5 @@
 
 #if AMP_MRG
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
 Void TEncCu::xCheckRDCostInter( TComDataCU*& rpcBestCU, TComDataCU*& rpcTempCU, PartSize ePartSize, Bool bFMD, Bool bUseMRG)
 #else
@@ -2053,5 +2053,5 @@
 #endif
 {
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
   if(!(bFMD && (ePartSize == SIZE_2Nx2N)))  //have  motion estimation or merge check
   {
@@ -2130,5 +2130,5 @@
 #if AMP_MRG
   rpcTempCU->setMergeAMP (true);
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
   m_pcPredSearch->predInterSearch ( rpcTempCU, m_ppcOrigYuv[uhDepth], m_ppcPredYuvTemp[uhDepth], m_ppcResiYuvTemp[uhDepth], m_ppcRecoYuvTemp[uhDepth], bFMD, false, bUseMRG );
 #else
@@ -2245,5 +2245,5 @@
   }
 #endif
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
   }
 #endif
Index: branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibEncoder/TEncCu.h
===================================================================
--- branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibEncoder/TEncCu.h	(revision 649)
+++ branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibEncoder/TEncCu.h	(revision 650)
@@ -160,5 +160,5 @@
 
 #if AMP_MRG
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
   Void  xCheckRDCostInter   ( TComDataCU*& rpcBestCU, TComDataCU*& rpcTempCU, PartSize ePartSize,  Bool bFMD, Bool bUseMRG = false  ) ;
 #else
Index: branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibEncoder/TEncSearch.cpp
===================================================================
--- branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibEncoder/TEncSearch.cpp	(revision 649)
+++ branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibEncoder/TEncSearch.cpp	(revision 650)
@@ -3703,5 +3703,5 @@
  */
 #if AMP_MRG
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
 Void TEncSearch::predInterSearch( TComDataCU* pcCU, TComYuv* pcOrgYuv, TComYuv*& rpcPredYuv, TComYuv*& rpcResiYuv, TComYuv*& rpcRecoYuv, Bool bFMD, Bool bUseRes, Bool bUseMRG )
 #else
@@ -3815,5 +3815,5 @@
 #if AMP_MRG
     Bool bTestNormalMC = true;
-#if  H_3D_FAST_TEXTURE_ENCODIN
+#if  H_3D_FAST_TEXTURE_ENCODING
     if (bFMD||( bUseMRG && pcCU->getWidth( 0 ) > 8 && iNumPart == 2 ))
 #else            
Index: branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibEncoder/TEncSearch.h
===================================================================
--- branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibEncoder/TEncSearch.h	(revision 649)
+++ branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibEncoder/TEncSearch.h	(revision 650)
@@ -196,5 +196,5 @@
                                   TComYuv*&   rpcResiYuv,
                                   TComYuv*&   rpcRecoYuv,
-#if H_3D_FAST_TEXTURE_ENCODIN
+#if H_3D_FAST_TEXTURE_ENCODING
                                   Bool        bFMD,
 #endif