Changeset 363 in 3DVCSoftware for branches/HTM-DEV-0.1-dev/source/Lib/TLibDecoder

Timestamp:

3 May 2013, 15:59:14 (12 years ago)

Author:

tech

Message:

Fixed wrongly merged parts.

File:

• branches/HTM-DEV-0.1-dev/source/Lib/TLibDecoder/TDecTop.cpp (modified) (2 diffs)

branches/HTM-DEV-0.1-dev/source/Lib/TLibDecoder/TDecTop.cpp

@@ -591 +591 @@
     // Set reference list
 #if H_MV    
-    pcSlice->setRefPicList( m_cListPic, true, m_refPicSetInterLayer );    
+    pcSlice->setRefPicList( m_cListPic, m_refPicSetInterLayer, true );    
 #else
 #if FIX1071
@@ -782 +782 @@
     case NAL_UNIT_CODED_SLICE_RASL_N:
     case NAL_UNIT_CODED_SLICE_RASL_R:
+#if H_MV
+      return xDecodeSlice(nalu, iSkipFrame, iPOCLastDisplay, newLayerFlag);
+#else
       return xDecodeSlice(nalu, iSkipFrame, iPOCLastDisplay);
+#endif
       break;
     default: