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.cpp

    r650 r653  
    70247024}
    70257025
     7026#if H_3D_DIM
    70267027  // -------------------------------------------------------------------------------------------------------------------
    70277028  // Depth intra search
    70287029  // -------------------------------------------------------------------------------------------------------------------
    7029 #if H_3D_DIM
    70307030Void TEncSearch::xCalcBiSegDCs( Pel* ptrSrc, UInt srcStride, Bool* biSegPattern, Int patternStride, Pel& valDC1, Pel& valDC2 )
    70317031{
Note: See TracChangeset for help on using the changeset viewer.