Changeset 773 in 3DVCSoftware for trunk/source/Lib/TLibEncoder/TEncSlice.cpp

Timestamp:

16 Jan 2014, 09:56:13 (10 years ago)

Author:

tech

Message:

Merged branch/9.2-dev0@722.

File:

• trunk/source/Lib/TLibEncoder/TEncSlice.cpp (modified) (2 diffs)

trunk/source/Lib/TLibEncoder/TEncSlice.cpp

@@ -556 +556 @@
   rpcSlice->setSliceSegmentArgument ( m_pcCfg->getSliceSegmentArgument() );
 #if H_3D_IV_MERGE
-#if SEC_MPI_ENABLING_MERGE_F0150
   if(rpcSlice->getIsDepth())
   {
@@ -565 +564 @@
     rpcSlice->setMaxNumMergeCand      ( m_pcCfg->getMaxNumMergeCand()   + ( rpcSlice->getVPS()->getIvMvPredFlag( rpcSlice->getLayerIdInVps() ) ? 1 : 0 ) );
   }
-#else
-   rpcSlice->setMaxNumMergeCand      ( m_pcCfg->getMaxNumMergeCand()   + ( rpcSlice->getVPS()->getIvMvPredFlag( rpcSlice->getLayerIdInVps() ) ? 1 : 0 ) );
-#endif
 #else
   rpcSlice->setMaxNumMergeCand        ( m_pcCfg->getMaxNumMergeCand()        );