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

    r652 r653  
    272272#if RATE_CONTROL_LAMBDA_DOMAIN
    273273#if !M0036_RC_IMPROVEMENT
     274  m_addSADDepth      = 0;
    274275  m_LCUPredictionSAD = 0;
    275   m_addSADDepth      = 0;
    276276  m_temporalSAD      = 0;
    277277#endif
     
    11891189
    11901190    // further split
     1191#if H_3D_QTLPC
    11911192    if( bSubBranch && bTrySplitDQP && uiDepth < g_uiMaxCUDepth - g_uiAddCUDepth )
     1193#else
     1194    if( bSubBranch && uiDepth < g_uiMaxCUDepth - g_uiAddCUDepth )
     1195#endif
    11921196    {
    11931197#if H_3D_VSO // M9
Note: See TracChangeset for help on using the changeset viewer.