Index: branches/SHM-dev/source/Lib/TLibEncoder/SEIwrite.cpp
===================================================================
--- branches/SHM-dev/source/Lib/TLibEncoder/SEIwrite.cpp	(revision 1096)
+++ branches/SHM-dev/source/Lib/TLibEncoder/SEIwrite.cpp	(revision 1098)
@@ -186,12 +186,4 @@
      break;
 #endif
-#if Q0078_ADD_LAYER_SETS
-   case SEI::OUTPUT_LAYER_SET_NESTING:
-     xWriteSEIOutputLayerSetNesting(bs, *static_cast<const SEIOutputLayerSetNesting*>(&sei), vps, sps);
-     break;
-   case SEI::VPS_REWRITING:
-     xWriteSEIVPSRewriting(*static_cast<const SEIVPSRewriting*>(&sei));
-     break;
-#endif
 #if Q0189_TMVP_CONSTRAINTS
    case SEI::TMVP_CONSTRAINTS:
@@ -1332,35 +1324,4 @@
 #endif
 
-#if Q0078_ADD_LAYER_SETS
-
-Void SEIWriter::xWriteSEIOutputLayerSetNesting(TComBitIf& bs, const SEIOutputLayerSetNesting &sei, TComVPS *vps, TComSPS *sps)
-{
-  WRITE_FLAG(sei.m_olsFlag, "ols_flag");
-  WRITE_UVLC(sei.m_numOlsIndicesMinus1, "num_ols_indices_minus1");
-
-  for (Int i = 0; i <= sei.m_numOlsIndicesMinus1; i++)
-  {
-    WRITE_UVLC(sei.m_olsIdx[i], "ols_idx[i]");
-  }
-
-  while (m_pcBitIf->getNumberOfWrittenBits() % 8 != 0)
-  {
-    WRITE_FLAG(0, "ols_nesting_zero_bit");
-  }
-
-  // write nested SEI messages
-  for (SEIMessages::const_iterator it = sei.m_nestedSEIs.begin(); it != sei.m_nestedSEIs.end(); it++)
-  {
-    writeSEImessage(bs, *(*it), vps, sps);
-  }
-}
-
-Void SEIWriter::xWriteSEIVPSRewriting(const SEIVPSRewriting &sei)
-{
-  //sei.nalu->
-}
-
-#endif
-
 #if P0123_ALPHA_CHANNEL_SEI
 Void SEIWriter::xWriteSEIAlphaChannelInfo(const SEIAlphaChannelInfo &sei)
Index: branches/SHM-dev/source/Lib/TLibEncoder/SEIwrite.h
===================================================================
--- branches/SHM-dev/source/Lib/TLibEncoder/SEIwrite.h	(revision 1096)
+++ branches/SHM-dev/source/Lib/TLibEncoder/SEIwrite.h	(revision 1098)
@@ -124,8 +124,4 @@
   Void xCodeHrdParameters( TComHRD *hrd, Bool commonInfPresentFlag, UInt maxNumSubLayersMinus1 );
 #endif
-#if Q0078_ADD_LAYER_SETS
-  Void xWriteSEIOutputLayerSetNesting(TComBitIf& bs, const SEIOutputLayerSetNesting &sei, TComVPS *vps, TComSPS *sps);
-  Void xWriteSEIVPSRewriting(const SEIVPSRewriting &sei);
-#endif
 #if P0123_ALPHA_CHANNEL_SEI
   Void xWriteSEIAlphaChannelInfo(const SEIAlphaChannelInfo &sei);