Ignore:
Timestamp:
29 Aug 2013, 15:10:30 (11 years ago)
Author:
tech
Message:

Merged dev3: DEV-2.0-DEV3-KWU@589

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-DEV-2.0-dev0/source/Lib/TLibDecoder/TDecSbac.h

    r598 r601  
    102102#if H_3D_DIM_DMM
    103103  Void  xParseDmm1WedgeIdx   ( UInt& ruiTabIdx, Int iNumBit );
     104#if !SEC_DMM2_E0146
    104105  Void  xParseDmm2Offset     ( Int& riOffset );
     106#endif
    105107  Void  xParseDmm3WedgeIdx   ( UInt& ruiIntraIdx, Int iNumBit );
    106108#endif
     
    214216#if H_3D_DIM_DMM
    215217  ContextModel3DBuffer m_cDmm1DataSCModel;
     218#if !SEC_DMM2_E0146
    216219  ContextModel3DBuffer m_cDmm2DataSCModel;
     220#endif
    217221  ContextModel3DBuffer m_cDmm3DataSCModel;
    218222#endif
Note: See TracChangeset for help on using the changeset viewer.