Ignore:
Timestamp:
3 May 2013, 15:59:14 (11 years ago)
Author:
tech
Message:

Fixed wrongly merged parts.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-DEV-0.1-dev/source/Lib/TLibDecoder/TDecTop.cpp

    r362 r363  
    591591    // Set reference list
    592592#if H_MV   
    593     pcSlice->setRefPicList( m_cListPic, true, m_refPicSetInterLayer );   
     593    pcSlice->setRefPicList( m_cListPic, m_refPicSetInterLayer, true );   
    594594#else
    595595#if FIX1071
     
    782782    case NAL_UNIT_CODED_SLICE_RASL_N:
    783783    case NAL_UNIT_CODED_SLICE_RASL_R:
     784#if H_MV
     785      return xDecodeSlice(nalu, iSkipFrame, iPOCLastDisplay, newLayerFlag);
     786#else
    784787      return xDecodeSlice(nalu, iSkipFrame, iPOCLastDisplay);
     788#endif
    785789      break;
    786790    default:
Note: See TracChangeset for help on using the changeset viewer.