Index: branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp
===================================================================
--- branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp	(revision 1165)
+++ branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp	(revision 1166)
@@ -3475,9 +3475,5 @@
   else
   {
-#if VPS_VUI_VST_PARAMS
     vps->setNumVideoSignalInfo(vps->getMaxLayers() - vps->getBaseLayerInternalFlag() ? 0 : 1);
-#else
-    vps->setNumVideoSignalInfo(vps->getMaxLayers());
-#endif
   }
 
@@ -3490,5 +3486,5 @@
     READ_CODE(8, uiCode, "matrix_coeffs_vps" );vps->setMaxtrixCoeff(i,uiCode);
   }
-#if VPS_VUI_VST_PARAMS
+
   if( vps->getVideoSigPresentVpsFlag() && vps->getNumVideoSignalInfo() > 1 )
   {
@@ -3512,27 +3508,5 @@
     }
   }
-#else
-  if(!vps->getVideoSigPresentVpsFlag())
-  {
-    for (i=0; i < vps->getMaxLayers(); i++)
-    {
-      vps->setVideoSignalInfoIdx(i,i);
-    }
-  }
-  else {
-    vps->setVideoSignalInfoIdx(0,0);
-    if (vps->getNumVideoSignalInfo() > 1 )
-    {
-      for (i=1; i < vps->getMaxLayers(); i++)
-        READ_CODE(4, uiCode, "vps_video_signal_info_idx" ); vps->setVideoSignalInfoIdx(i, uiCode);
-    }
-    else {
-      for (i=1; i < vps->getMaxLayers(); i++)
-      {
-        vps->setVideoSignalInfoIdx(i,0);
-      }
-    }
-  }
-#endif
+
 #endif 
 #if VPS_VUI_TILES_NOT_IN_USE__FLAG