Ignore:
Timestamp:
16 Mar 2015, 12:40:05 (9 years ago)
Author:
tech
Message:

Merged branch 13.1-dev1-Samsung2@1162

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-13.1-dev0/source/Lib/TLibDecoder/TDecCAVLC.h

    r1133 r1163  
    124124 
    125125  Void  parseSkipFlag       ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
     126#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
     127  Void  parseDIS            ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
     128#else
    126129#if H_3D_SINGLE_DEPTH
    127130  Void  parseSingleDepthMode        ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    128 #endif 
     131#endif
     132#endif
    129133  Void  parseCUTransquantBypassFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
    130134  Void parseMergeFlag       ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, UInt uiPUIdx );
Note: See TracChangeset for help on using the changeset viewer.