Ignore:
Timestamp:
20 May 2013, 01:51:15 (11 years ago)
Author:
mitsubishi-htm
Message:

-macro updates.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-6.2-dev2-MERL/source/Lib/TLibCommon/TComDataCU.cpp

    r419 r422  
    38623862      cDisInfo.m_acMvCandNoRef[0] = getDvInfo(uiAbsPartIdx).m_acMvCandNoRef[0];
    38633863#endif
     3864#if MERL_General_Fix
    38643865#if MERL_VSP_C0152
    38653866#if MERL_VSP_NBDV_RefVId_Fix_D0166
    38663867      cDisInfo.m_aListIdx[0] = getDvInfo(uiAbsPartIdx).m_aListIdx[0];
    38673868      cDisInfo.m_aRefIdx[0]  = getDvInfo(uiAbsPartIdx).m_aRefIdx[0];
     3869#endif
    38683870#endif
    38693871#endif
     
    53805382
    53815383          TComPic* picDepth = NULL;
     5384#if MERL_General_Fix
    53825385#if MERL_VSP_C0152
    53835386#if MERL_VSP_NBDV_RefVId_Fix_D0166
     
    53885391#else
    53895392          picDepth = getSlice()->getRefPicBaseDepth();
     5393#endif
    53905394#endif
    53915395#endif
Note: See TracChangeset for help on using the changeset viewer.