Index: /branches/SHM-dev/source/Lib/TLibCommon/SEI.cpp
===================================================================
--- /branches/SHM-dev/source/Lib/TLibCommon/SEI.cpp	(revision 1097)
+++ /branches/SHM-dev/source/Lib/TLibCommon/SEI.cpp	(revision 1098)
@@ -152,8 +152,4 @@
     case SEI::BSP_INITIAL_ARRIVAL_TIME:             return "Bitstream parition initial arrival time";
 #endif
-#if Q0078_ADD_LAYER_SETS
-    case SEI::OUTPUT_LAYER_SET_NESTING:             return "Output layer set nesting";
-    case SEI::VPS_REWRITING:                        return "VPS rewriting";
-#endif
 #if Q0096_OVERLAY_SEI
     case SEI::OVERLAY_INFO:                         return "Overlay Information";
Index: /branches/SHM-dev/source/Lib/TLibCommon/SEI.h
===================================================================
--- /branches/SHM-dev/source/Lib/TLibCommon/SEI.h	(revision 1097)
+++ /branches/SHM-dev/source/Lib/TLibCommon/SEI.h	(revision 1098)
@@ -119,8 +119,4 @@
     FRAME_FIELD_INFO                     = 168,
 #endif
-#if Q0078_ADD_LAYER_SETS
-    OUTPUT_LAYER_SET_NESTING             = 149,
-    VPS_REWRITING                        = 150,
-#endif
   };
   
@@ -638,41 +634,4 @@
 };
 
-#if Q0078_ADD_LAYER_SETS
-class SEIOutputLayerSetNesting : public SEI
-{
-public:
-  PayloadType payloadType() const { return OUTPUT_LAYER_SET_NESTING; }
-
-  SEIOutputLayerSetNesting()
-    : m_callerOwnsSEIs(false)
-  {}
-
-  virtual ~SEIOutputLayerSetNesting()
-  {
-    if (!m_callerOwnsSEIs)
-    {
-      deleteSEIs(m_nestedSEIs);
-    }
-  }
-
-  Bool m_olsFlag;
-  UInt m_numOlsIndicesMinus1;
-  UInt m_olsIdx[1024];
-  Bool  m_callerOwnsSEIs;
-  SEIMessages m_nestedSEIs;
-};
-
-class SEIVPSRewriting : public SEI
-{
-public:
-  PayloadType payloadType() const { return VPS_REWRITING; }
-
-  SEIVPSRewriting() {}
-  virtual ~SEIVPSRewriting() {}
-
-  NALUnit* nalu;
-};
-#endif
-
 #if P0123_ALPHA_CHANNEL_SEI
 class SEIAlphaChannelInfo : public SEI
Index: /branches/SHM-dev/source/Lib/TLibDecoder/SEIread.cpp
===================================================================
--- /branches/SHM-dev/source/Lib/TLibDecoder/SEIread.cpp	(revision 1097)
+++ /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 1097)
+++ /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);
Index: /branches/SHM-dev/source/Lib/TLibEncoder/SEIwrite.cpp
===================================================================
--- /branches/SHM-dev/source/Lib/TLibEncoder/SEIwrite.cpp	(revision 1097)
+++ /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 1097)
+++ /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);