Changeset 1410 in SHVCSoftware for branches/SHM-dev

Timestamp:

4 Aug 2015, 04:24:48 (9 years ago)

Author:

seregin

Message:

port rev 4563

File:

• branches/SHM-dev/source/Lib/TLibDecoder/TDecEntropy.cpp (modified) (2 diffs)

branches/SHM-dev/source/Lib/TLibDecoder/TDecEntropy.cpp

@@ -212 +212 @@
 #endif
 
-      UInt uiMergeIndex = pcCU->getMergeIndex(uiSubPartIdx);
+      const UInt uiMergeIndex = pcCU->getMergeIndex(uiSubPartIdx);
       if ( pcCU->getSlice()->getPPS()->getLog2ParallelMergeLevelMinus2() && ePartSize != SIZE_2Nx2N && pcSubCU->getWidth( 0 ) <= 8 )
       {
@@ -225 +225 @@
       else
       {
-        uiMergeIndex = pcCU->getMergeIndex(uiSubPartIdx);
         pcSubCU->getInterMergeCandidates( uiSubPartIdx-uiAbsPartIdx, uiPartIdx, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand, uiMergeIndex );
       }