Changeset 1317 in 3DVCSoftware for branches/HTM-15.0-dev0/source/Lib/TLibDecoder/TDecEntropy.cpp

Timestamp:

4 Sep 2015, 21:28:58 (9 years ago)

Author:

tech

Message:

Clean-ups. HLS.

File:

• branches/HTM-15.0-dev0/source/Lib/TLibDecoder/TDecEntropy.cpp (modified) (2 diffs)

branches/HTM-15.0-dev0/source/Lib/TLibDecoder/TDecEntropy.cpp

@@ -238 +238 @@
   UInt uiNumPU = ( ePartSize == SIZE_2Nx2N ? 1 : ( ePartSize == SIZE_NxN ? 4 : 2 ) );
   UInt uiPUOffset = ( g_auiPUOffset[UInt( ePartSize )] << ( ( pcCU->getSlice()->getSPS()->getMaxTotalCUDepth() - uiDepth ) << 1 ) ) >> 4;
+
+#if NH_3D_MLC
 //#if H_3D_IV_MERGE
-#if NH_3D_MLC
   TComMvField cMvFieldNeighbours[MRG_MAX_NUM_CANDS_MEM << 1]; // double length for mv of both lists
   UChar uhInterDirNeighbours[MRG_MAX_NUM_CANDS_MEM];
@@ -651 +652 @@
 #endif
         }
-      }
+      } 
 #if NH_3D_IC
       decodeICFlag( pcCU, uiAbsPartIdx, uiDepth );