Index: branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp
===================================================================
--- branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp	(revision 1160)
+++ branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp	(revision 1161)
@@ -1071,7 +1071,9 @@
     }
   }
-#if DERIVE_LAYER_ID_LIST_VARIABLES
+
+#if SVC_EXTENSION
   pcVPS->deriveLayerIdListVariables();
 #endif
+
   TimingInfo *timingInfo = pcVPS->getTimingInfo();
   READ_FLAG(       uiCode, "vps_timing_info_present_flag");         timingInfo->setTimingInfoPresentFlag      (uiCode ? true : false);
@@ -2684,5 +2686,5 @@
   }
 #endif
-#if VPS_EXTN_MASK_AND_DIM_INFO
+
   UInt numScalabilityTypes = 0, i = 0, j = 0;
 
@@ -2741,5 +2743,5 @@
     }
   }
-#endif
+
 #if VIEW_ID_RELATED_SIGNALING
 #if O0109_VIEW_ID_LEN