Index: branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp
===================================================================
--- branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp	(revision 1130)
+++ branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp	(revision 1131)
@@ -106,7 +106,5 @@
   m_isLastNALWasEos = false;
 #endif
-#if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
   m_lastPicHasEos = false;
-#endif
 #if NO_CLRAS_OUTPUT_FLAG
   m_noClrasOutputFlag          = false;
@@ -852,10 +850,8 @@
       setNoClrasOutputFlag(true);
     }
-#if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
     else if( m_lastPicHasEos )
     {
       setNoClrasOutputFlag(true);
     }
-#endif
     else if ( m_apcSlicePilot->getBlaPicFlag() )
     {
@@ -1483,8 +1479,10 @@
     }
 #endif
-#if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
+
+#if SVC_EXTENSION
     xCheckLayerReset();
     xSetLayerInitializedFlag();
 #endif
+
     // Buffer initialize for prediction.
     m_cPrediction.initTempBuff(m_apcSlicePilot->getSPS()->getChromaFormatIdc());
@@ -1993,5 +1991,5 @@
   setFirstPicInLayerDecodedFlag(true);
 #endif
-#if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
+#if SVC_EXTENSION
   m_lastPicHasEos = false;
 #endif
@@ -2248,16 +2246,7 @@
 #if Q0177_EOS_CHECKS
       assert( m_isLastNALWasEos == false );
-#if !R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
-      //Check layer id of the nalu. if it is not 0, give a warning message and just return without doing anything.
-      if (nalu.m_layerId > 0)
-      {
-        printf( "\nThis bitstream has EOS with non-zero layer id.\n" );
-        return false;
-      }
-#endif
+
       m_isLastNALWasEos = true;
-#if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
       m_lastPicHasEos = true;
-#endif
 #endif
       m_associatedIRAPType = NAL_UNIT_INVALID;
@@ -2687,5 +2676,4 @@
 #endif
 
-#if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
 Void TDecTop::xCheckLayerReset()
 {
@@ -2772,7 +2760,5 @@
   }
 }
-#endif
-
-#if SVC_EXTENSION
+
 Void TDecTop::xDeriveSmallestLayerId(TComVPS* vps)
 {
@@ -2811,5 +2797,4 @@
   }
 }
-#endif
 
 Void TDecTop::xSetSpatialEnhLayerFlag(TComSlice* slice, TComPic* pic)
Index: branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.h
===================================================================
--- branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.h	(revision 1130)
+++ branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.h	(revision 1131)
@@ -124,7 +124,5 @@
   Bool                    m_isLastNALWasEos;
 #endif
-#if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
   Bool                    m_lastPicHasEos;
-#endif
   static UInt             m_prevPOC;        // POC of the previous slice
   static UInt             m_uiPrevLayerId;  // LayerId of the previous slice
@@ -310,4 +308,5 @@
   Void      xDecodeSEI( TComInputBitstream* bs, const NalUnitType nalUnitType );
 
+#if SVC_EXTENSION
 #if NO_CLRAS_OUTPUT_FLAG
   Int  getNoClrasOutputFlag()                { return m_noClrasOutputFlag;}
@@ -324,5 +323,4 @@
   Void resetPocRestrictionCheckParameters();
 #endif
-#if R0071_IRAP_EOS_CROSS_LAYER_IMPACTS
   Void xCheckLayerReset();
   Void xSetNoRaslOutputFlag();