Index: branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp
===================================================================
--- branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp	(revision 1109)
+++ branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp	(revision 1111)
@@ -89,12 +89,4 @@
   m_bFirstSliceInSequence   = true;
 #endif
-#if SVC_EXTENSION 
-  m_layerId = 0;
-  m_smallestLayerId = 0;
-#if AVC_BASE
-  m_pBLReconFile = NULL;
-#endif
-  memset(m_cIlpPic, 0, sizeof(m_cIlpPic));
-#endif
   m_prevSliceSkipped = false;
   m_skippedPOC = 0;
@@ -103,4 +95,12 @@
   m_craNoRaslOutputFlag = false;
   m_isNoOutputPriorPics = false;
+
+#if SVC_EXTENSION 
+  m_layerId = 0;
+  m_smallestLayerId = 0;
+#if AVC_BASE
+  m_pBLReconFile = NULL;
+#endif
+  memset(m_cIlpPic, 0, sizeof(m_cIlpPic));
 #if Q0177_EOS_CHECKS
   m_isLastNALWasEos = false;
@@ -133,7 +133,6 @@
   m_confModeFlag = false;
 #endif
-#if FIX_NON_OUTPUT_LAYER
   m_isOutputLayerFlag = false;
-#endif
+#endif //SVC_EXTENSION 
 }
 
@@ -379,5 +378,5 @@
   m_cGopDecoder.filterPicture(pcPic);
 
-#if FIX_NON_OUTPUT_LAYER
+#if SVC_EXTENSION
   if( this->getLayerDec(pcPic->getLayerId())->m_isOutputLayerFlag == false )
   {
@@ -2711,5 +2710,4 @@
   params->setTargetLayerId( vps->getLayerSetLayerIdList( targetLsIdx, vps->getNumLayersInIdList(targetLsIdx)-1 ) );
 
-#if FIX_NON_OUTPUT_LAYER
   // Check if the current layer is an output layer
   for(Int i = 0; i < vps->getNumLayersInIdList( targetLsIdx ); i++)
@@ -2720,5 +2718,4 @@
     }
   }
-#endif
 }
 #endif
Index: branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.h
===================================================================
--- branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.h	(revision 1109)
+++ branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.h	(revision 1111)
@@ -152,5 +152,4 @@
 #endif
   TComPic*                m_cIlpPic[MAX_NUM_REF];                    ///<  Inter layer Prediction picture =  upsampled picture
-#endif 
 #if OUTPUT_LAYER_SET_INDEX
   CommonDecoderParams*    m_commonDecoderParams;
@@ -170,8 +169,9 @@
   std::vector<TComPic>   m_confListPic;         //  Dynamic buffer for storing pictures for conformance purposes
 #endif
-#if FIX_NON_OUTPUT_LAYER
   Bool m_isOutputLayerFlag;
-#endif
+#endif //SVC_EXTENSION
+
 public:
+#if SVC_EXTENSION
 #if POC_RESET_RESTRICTIONS
   static Bool                    m_checkPocRestrictionsForCurrAu;
@@ -189,4 +189,5 @@
   static Int                     m_crossLayerPocResetIdc;
 #endif
+#endif //SVC_EXTENSION
 
   TDecTop();