Index: branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp
===================================================================
--- branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp	(revision 1178)
+++ branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp	(revision 1179)
@@ -1008,9 +1008,5 @@
 #endif
 #if SVC_EXTENSION
-#if O0137_MAX_LAYERID
   READ_CODE( 6,  uiCode,  "vps_max_layers_minus1" );              pcVPS->setMaxLayers( min( 62u, uiCode) + 1 );
-#else
-  READ_CODE( 6,  uiCode,  "vps_max_layers_minus1" );              pcVPS->setMaxLayers( uiCode + 1 );
-#endif
   assert( pcVPS->getBaseLayerInternalFlag() || pcVPS->getMaxLayers() > 1 );
 #else
Index: branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp
===================================================================
--- branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp	(revision 1178)
+++ branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp	(revision 1179)
@@ -2072,7 +2072,7 @@
   m_cEntropyDecoder.setBitstream      (nalu.m_Bitstream);
 
-#if O0137_MAX_LAYERID
+#if SVC_EXTENSION
   // ignore any NAL units with nuh_layer_id == 63
-  if (nalu.m_layerId == 63 )
+  if( nalu.m_layerId == 63 )
   {  
     return false;