Ignore:
Timestamp:
21 Oct 2013, 18:32:39 (11 years ago)
Author:
tech
Message:

Added missing parts of merge.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-8.2-dev0-Cleanup/source/Lib/TLibEncoder/TEncSearch.h

    r650 r653  
    343343                                    UInt         stateU0V1Both2 );
    344344
    345 
     345#if H_3D_DIM
    346346  // -------------------------------------------------------------------------------------------------------------------
    347347  // Depth intra search
    348348  // -------------------------------------------------------------------------------------------------------------------
    349 #if H_3D_DIM
    350349  Void xCalcBiSegDCs              ( Pel* ptrSrc, UInt srcStride, Bool* biSegPattern, Int patternStride, Pel& valDC1, Pel& valDC2 );
    351350#if H_3D_DIM_DMM
Note: See TracChangeset for help on using the changeset viewer.