Index: branches/SHM-dev/source/Lib/TLibDecoder/SEIread.cpp
===================================================================
--- branches/SHM-dev/source/Lib/TLibDecoder/SEIread.cpp	(revision 1096)
+++ branches/SHM-dev/source/Lib/TLibDecoder/SEIread.cpp	(revision 1098)
@@ -351,18 +351,4 @@
      break;
 #endif
-#if Q0078_ADD_LAYER_SETS
-   case SEI::OUTPUT_LAYER_SET_NESTING:
-     sei = new SEIOutputLayerSetNesting;
-#if LAYERS_NOT_PRESENT_SEI
-     xParseSEIOutputLayerSetNesting((SEIOutputLayerSetNesting&)*sei, nalUnitType, vps, sps, pDecodedMessageOutputStream);
-#else
-     xParseSEIOutputLayerSetNesting((SEIOutputLayerSetNesting&)*sei, nalUnitType, sps, pDecodedMessageOutputStream);
-#endif
-     break;
-   case SEI::VPS_REWRITING:
-     sei = new SEIVPSRewriting;
-     xParseSEIVPSRewriting((SEIVPSRewriting&)*sei, pDecodedMessageOutputStream);
-     break;
-#endif
 #if Q0189_TMVP_CONSTRAINTS
    case SEI::TMVP_CONSTRAINTS:
@@ -1734,57 +1720,4 @@
 #endif
 
-#if Q0078_ADD_LAYER_SETS
-
-#if LAYERS_NOT_PRESENT_SEI
-Void SEIReader::xParseSEIOutputLayerSetNesting(SEIOutputLayerSetNesting& sei, const NalUnitType nalUnitType, TComVPS *vps, TComSPS *sps, std::ostream *pDecodedMessageOutputStream)
-#else
-Void SEIReader::xParseSEIOutputLayerSetNesting(SEIOutputLayerSetNesting& sei, const NalUnitType nalUnitType, TComSPS *sps, std::ostream *pDecodedMessageOutputStream)
-#endif
-{
-  UInt uiCode;
-  SEIMessages seis;
-
-  sei_read_flag( pDecodedMessageOutputStream, uiCode, "ols_flag"); sei.m_olsFlag = uiCode;
-  sei_read_uvlc( pDecodedMessageOutputStream, uiCode, "num_ols_indices_minus1"); sei.m_numOlsIndicesMinus1 = uiCode;
-
-  for (Int i = 0; i <= sei.m_numOlsIndicesMinus1; i++)
-  {
-    sei_read_uvlc( pDecodedMessageOutputStream, uiCode, "ols_idx[i]"); sei.m_olsIdx[i] = uiCode;
-  }
-
-  // byte alignment
-  while (m_pcBitstream->getNumBitsRead() % 8 != 0)
-  {
-    UInt code;
-    sei_read_flag( pDecodedMessageOutputStream, code, "ols_nesting_zero_bit");
-  }
-
-  sei.m_callerOwnsSEIs = false;
-
-  // read nested SEI messages
-  do {
-#if O0164_MULTI_LAYER_HRD
-#if LAYERS_NOT_PRESENT_SEI
-    xReadSEImessage(sei.m_nestedSEIs, nalUnitType, vps, sps, pDecodedMessageOutputStream);
-#else
-    xReadSEImessage(sei.m_nestedSEIs, nalUnitType, sps, pDecodedMessageOutputStream);
-#endif
-#else
-#if LAYERS_NOT_PRESENT_SEI
-    xReadSEImessage(sei.m_nestedSEIs, nalUnitType, vps, sps, pDecodedMessageOutputStream);
-#else
-    xReadSEImessage(sei.m_nestedSEIs, nalUnitType, sps, pDecodedMessageOutputStream);
-#endif
-#endif
-  } while (m_pcBitstream->getNumBitsLeft() > 8);
-
-}
-
-Void SEIReader::xParseSEIVPSRewriting(SEIVPSRewriting &sei, std::ostream *pDecodedMessageOutputStream )
-{
-}
-
-#endif
-
 #if P0123_ALPHA_CHANNEL_SEI
 void SEIReader::xParseSEIAlphaChannelInfo(SEIAlphaChannelInfo &sei, UInt payloadSize, std::ostream *pDecodedMessageOutputStream)
Index: branches/SHM-dev/source/Lib/TLibDecoder/SEIread.h
===================================================================
--- branches/SHM-dev/source/Lib/TLibDecoder/SEIread.h	(revision 1096)
+++ branches/SHM-dev/source/Lib/TLibDecoder/SEIread.h	(revision 1098)
@@ -136,13 +136,4 @@
   Void xParseHrdParameters                    (TComHRD *hrd, Bool commonInfPresentFlag, UInt maxNumSubLayersMinus1, std::ostream *pDecodedMessageOutputStream);
 #endif
-#if Q0078_ADD_LAYER_SETS
-#if LAYERS_NOT_PRESENT_SEI
-  Void xParseSEIOutputLayerSetNesting         (SEIOutputLayerSetNesting& sei, const NalUnitType nalUnitType, TComVPS *vps, TComSPS *sps, std::ostream *pDecodedMessageOutputStream);
-#else
-  Void xParseSEIOutputLayerSetNesting         (SEIOutputLayerSetNesting& sei, const NalUnitType nalUnitType, TComSPS *sps, std::ostream *pDecodedMessageOutputStream);
-#endif
-  Void xParseSEIVPSRewriting                  (SEIVPSRewriting &sei, std::ostream *pDecodedMessageOutputStream);
-#endif
-
 #if Q0189_TMVP_CONSTRAINTS 
   Void xParseSEITMVPConstraints               (SEITMVPConstrains& sei, UInt payloadSize, std::ostream *pDecodedMessageOutputStream);