Ignore:
Timestamp:
5 Feb 2014, 18:55:49 (10 years ago)
Author:
tech
Message:

Merged 9.3-dev2-MediaTek@812.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-9.3-dev0/source/Lib/TLibDecoder/TDecCu.cpp

    r820 r826  
    415415    UInt uiMergeIndex = pcCU->getMergeIndex(uiAbsPartIdx);
    416416
     417#if !SEC_IC_ARP_SIG_G0072
    417418#if H_3D_IC
    418419    m_pcEntropyDecoder->decodeICFlag( pcCU, uiAbsPartIdx, uiDepth );
    419420#endif
     421#endif
    420422#if H_3D_ARP
    421423    m_pcEntropyDecoder->decodeARPW( pcCU , uiAbsPartIdx , uiDepth );
     424#endif
     425#if SEC_IC_ARP_SIG_G0072
     426#if H_3D_IC
     427    m_pcEntropyDecoder->decodeICFlag( pcCU, uiAbsPartIdx, uiDepth );
     428#endif
    422429#endif
    423430
Note: See TracChangeset for help on using the changeset viewer.