Index: branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp
===================================================================
--- branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp	(revision 1114)
+++ branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp	(revision 1115)
@@ -3447,13 +3447,4 @@
 #endif
 
-#if !O0109_O0199_FLAGS_TO_VUI
-#if M0040_ADAPTIVE_RESOLUTION_CHANGE
-  READ_FLAG(uiCode, "single_layer_for_non_irap_flag" ); vps->setSingleLayerForNonIrapFlag(uiCode == 1 ? true : false);
-#endif
-#if HIGHER_LAYER_IRAP_SKIP_FLAG
-  READ_FLAG(uiCode, "higher_layer_irap_skip_flag" ); vps->setHigherLayerIrapSkipFlag(uiCode == 1 ? true : false);
-#endif
-#endif
-
   READ_FLAG( uiCode, "vps_vui_present_flag"); vps->setVpsVuiPresentFlag(uiCode ? true : false);
 
@@ -3972,5 +3963,4 @@
 #endif
 
-#if O0109_O0199_FLAGS_TO_VUI
 #if M0040_ADAPTIVE_RESOLUTION_CHANGE
   READ_FLAG(uiCode, "single_layer_for_non_irap_flag" ); vps->setSingleLayerForNonIrapFlag(uiCode == 1 ? true : false);
@@ -3984,5 +3974,4 @@
     assert( !vps->getHigherLayerIrapSkipFlag() );
   }
-#endif
 #endif
 #if N0160_VUI_EXT_ILP_REF