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


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

Fixed wrongly merged parts.

Location:
branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/TComSlice.cpp

    r362 r363  
    421421
    422422#if H_MV
    423 Void TComSlice::setRefPicList( TComList<TComPic*>& rcListPic, Bool checkNumPocTotalCurr,std::vector<TComPic*>& refPicSetInterLayer )
     423Void TComSlice::setRefPicList( TComList<TComPic*>& rcListPic, std::vector<TComPic*>& refPicSetInterLayer , Bool checkNumPocTotalCurr)
    424424#else
    425425#if FIX1071

  • branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/TComSlice.h

    r362 r363  
    15841584#endif
    15851585#if H_MV
    1586   Void      setRefPicList       ( TComList<TComPic*>& rcListPic, Bool checkNumPocTotalCurr = false , std::vector<TComPic*>& interLayerRefPicSet );
     1586  Void      setRefPicList       ( TComList<TComPic*>& rcListPic, std::vector<TComPic*>& interLayerRefPicSet , Bool checkNumPocTotalCurr = false );
    15871587#else
    15881588#if FIX1071
Note: See TracChangeset for help on using the changeset viewer.