Ignore:
Timestamp:
21 Oct 2013, 18:20:56 (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

    r651 r652  
    10061006#if H_3D_DIM_ENC
    10071007        if (( rpcBestCU->getSlice()->getIsDepth() && rpcBestCU->getSlice()->isIRAP() ) )
    1008 #endif
    1009         {
     1008        {
     1009#endif
     1010       
    10101011          // speedup for inter frames
    10111012          if( rpcBestCU->getSlice()->getSliceType() == I_SLICE ||
     
    10591060            }
    10601061          }
     1062#if H_3D_DIM_ENC
    10611063        }
    1062 
     1064#endif
    10631065        // test PCM
    10641066        if(pcPic->getSlice(0)->getSPS()->getUsePCM()
Note: See TracChangeset for help on using the changeset viewer.