Index: branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp
===================================================================
--- branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp	(revision 1136)
+++ branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp	(revision 1139)
@@ -838,5 +838,4 @@
   bNewPOC = m_apcSlicePilot->getPOC() != m_prevPOC || ( m_apcSlicePilot->getFirstSliceInPic() && m_parseIdc == -1 );
 
-#if NO_OUTPUT_OF_PRIOR_PICS
 #if NO_CLRAS_OUTPUT_FLAG
   if (m_layerId == m_smallestLayerId && m_apcSlicePilot->getRapPicFlag())
@@ -892,5 +891,4 @@
     }
   }
-#endif
 
 #if POC_RESET_IDC_DECODER
@@ -1357,4 +1355,5 @@
   if (m_bFirstSliceInPicture)
   {
+#if SVC_EXTENSION
 #if AVC_BASE
     if( m_layerId > 0 && m_parameterSetManagerDecoder.getPrefetchedVPS(0)->getNonHEVCBaseLayerFlag() )
@@ -1465,5 +1464,4 @@
 #endif
 
-#if NO_OUTPUT_OF_PRIOR_PICS
     if ( m_layerId == 0 && m_apcSlicePilot->getRapPicFlag() && getNoClrasOutputFlag() )
     {
@@ -1474,7 +1472,5 @@
       }
     }
-#endif
-
-#if SVC_EXTENSION
+
     xCheckLayerReset();
     xSetLayerInitializedFlag();