Index: branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp
===================================================================
--- branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp	(revision 1191)
+++ branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp	(revision 1198)
@@ -980,9 +980,5 @@
 
 #if SVC_EXTENSION
-#if O0062_POC_LSB_NOT_PRESENT_FLAG
     if( (pcSlice->getLayerId() > 0 && !pcSlice->getVPS()->getPocLsbNotPresentFlag( pcSlice->getVPS()->getLayerIdxInVps(pcSlice->getLayerId())) ) || !pcSlice->getIdrPicFlag())
-#else
-    if( pcSlice->getLayerId() > 0 || !pcSlice->getIdrPicFlag() )
-#endif
 #else
     if( !pcSlice->getIdrPicFlag() )
@@ -2196,6 +2192,6 @@
   WRITE_FLAG(vps->getVpsPocLsbAlignedFlag(), "vps_poc_lsb_aligned_flag");
 #endif
-#if O0062_POC_LSB_NOT_PRESENT_FLAG
-  for(i = 1; i< vps->getMaxLayers(); i++)
+
+  for( i = 1; i< vps->getMaxLayers(); i++ )
   {
     if( vps->getNumDirectRefLayers( vps->getLayerIdInNuh(i) ) == 0  )
@@ -2204,5 +2200,4 @@
     }
   }
-#endif
  
 #if VPS_DPB_SIZE_TABLE