Index: branches/SHM-2.1-multilayers-dev/source/Lib/TLibEncoder/TEncGOP.cpp
===================================================================
--- branches/SHM-2.1-multilayers-dev/source/Lib/TLibEncoder/TEncGOP.cpp	(revision 259)
+++ branches/SHM-2.1-multilayers-dev/source/Lib/TLibEncoder/TEncGOP.cpp	(revision 260)
@@ -543,5 +543,5 @@
         TComList<TComPic*> *cListPic = m_ppcTEncTop[m_layerId-1]->getListPic();
 #endif
-        pcSlice->setBaseColPic (*cListPic, refLayerIdc );
+        pcSlice->setBaseColPic( *cListPic, refLayerIdc );
 
 #if SIMPLIFIED_MV_POS_SCALING
@@ -936,4 +936,11 @@
     {
       pcSlice->getSPS()->setTMVPFlagsPresent(1);
+#if SVC_EXTENSION
+      if( pcSlice->getIdrPicFlag() )
+      {
+        pcSlice->setEnableTMVPFlag(0);
+      }
+      else
+#endif
       pcSlice->setEnableTMVPFlag(1);
     }
Index: branches/SHM-2.1-multilayers-dev/source/Lib/TLibEncoder/TEncSearch.cpp
===================================================================
--- branches/SHM-2.1-multilayers-dev/source/Lib/TLibEncoder/TEncSearch.cpp	(revision 259)
+++ branches/SHM-2.1-multilayers-dev/source/Lib/TLibEncoder/TEncSearch.cpp	(revision 260)
@@ -3313,5 +3313,5 @@
       
 #if (ENCODER_FAST_MODE)
-      if (pcCU->getSlice()->getNumRefIdx(eRefPicList) > 1)
+      if( pcCU->getSlice()->getNumRefIdx(eRefPicList) - pcCU->getSlice()->getActiveNumILRRefIdx() > 0)
       {
         testILR = false;
Index: branches/SHM-2.1-multilayers-dev/source/Lib/TLibEncoder/TEncSlice.cpp
===================================================================
--- branches/SHM-2.1-multilayers-dev/source/Lib/TLibEncoder/TEncSlice.cpp	(revision 259)
+++ branches/SHM-2.1-multilayers-dev/source/Lib/TLibEncoder/TEncSlice.cpp	(revision 260)
@@ -995,7 +995,4 @@
     TComDataCU*& pcCU = rpcPic->getCU( uiCUAddr );
     pcCU->initCU( rpcPic, uiCUAddr );
-#if SVC_EXTENSION
-    pcCU->setLayerId(m_pcCfg->getLayerId());
-#endif
 
 #if !RATE_CONTROL_LAMBDA_DOMAIN
Index: branches/SHM-2.1-multilayers-dev/source/Lib/TLibEncoder/TEncTop.cpp
===================================================================
--- branches/SHM-2.1-multilayers-dev/source/Lib/TLibEncoder/TEncTop.cpp	(revision 259)
+++ branches/SHM-2.1-multilayers-dev/source/Lib/TLibEncoder/TEncTop.cpp	(revision 260)
@@ -1222,5 +1222,5 @@
   }
 
-  return (TEncTop *)getLayerEnc( getVPS()->getRefLayerId( m_layerId, refLayerIdc ) );
+  return (TEncTop *)getLayerEnc( m_cVPS.getRefLayerId( m_layerId, refLayerIdc ) );
 }
 #endif