Index: branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp
===================================================================
--- branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp	(revision 1161)
+++ branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp	(revision 1163)
@@ -3759,6 +3759,6 @@
   }
 #endif
-#if P0182_VPS_VUI_PS_FLAG
-  for(i = 1; i < vps->getMaxLayers(); i++)
+
+  for( i = 1; i < vps->getMaxLayers(); i++ )
   {
     if (vps->getNumRefLayers(vps->getLayerIdInNuh(i)) == 0)
@@ -3772,5 +3772,4 @@
     }
   }
-#endif
 }
 
Index: branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp
===================================================================
--- branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp	(revision 1161)
+++ branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp	(revision 1163)
@@ -607,5 +607,4 @@
     }
 
-#if P0182_VPS_VUI_PS_FLAG
     UInt layerIdx = activeVPS->getLayerIdxInVps( m_layerId );
 
@@ -627,5 +626,4 @@
       assert( repFormat->getConformanceWindowVps().getWindowBottomOffset() == sps->getConformanceWindow().getWindowBottomOffset() );
     }    
-#endif
   }