Index: branches/HTM-15.1-dev0-Disney/source/Lib/TLibCommon/SEI.cpp
===================================================================
--- branches/HTM-15.1-dev0-Disney/source/Lib/TLibCommon/SEI.cpp	(revision 1343)
+++ branches/HTM-15.1-dev0-Disney/source/Lib/TLibCommon/SEI.cpp	(revision 1344)
@@ -371,5 +371,5 @@
   po::ErrorReporter err;
   po::parseConfigFile( opts, cfgFile, err );
-  m_lnpSeiMaxLayers = m_layerNotPresentFlag.size();
+  m_lnpSeiMaxLayers = (UInt) m_layerNotPresentFlag.size();
 };
 
@@ -382,4 +382,5 @@
 //  // TBD: Add constraints on presence of SEI here. 
     xCheckCfg     ( wrongConfig, m_lnpSeiActiveVpsId == vps->getVPSId(), "The value of lnp_sei_active_vps_id shall be equal to the value of vps_video_parameter_set_id of the active VPS for the VCL NAL units of the access unit containing the SEI message." );
+    xCheckCfg     ( wrongConfig, m_lnpSeiMaxLayers == vps->getMaxLayersMinus1(), "The number of LayerNotPresent flags shall be equal to vpsMaxLayersMinus1." );
 
 
@@ -753,7 +754,7 @@
   {
     sprintf(cstr, "LanguageTag%02d", i);
-    m_overlayLanguage[i] = std::string(cstr);
+    //m_overlayLanguage[i] = std::string(cstr);
     sprintf(cstr, "Overlay%02dName", i);
-    m_overlayName[i] = std::string(cstr);
+    //m_overlayName[i] = std::string(cstr);
 
     m_overlayElementName[i].resize(m_numOverlayElementsMax);
@@ -803,4 +804,7 @@
     ("OverlayElementLabelMin_%d"      , m_overlayElementLabelMin           , IntAry1d (256,0) ,16            , "OverlayElementLabelMin"           )
     ("OverlayElementLabelMax_%d"      , m_overlayElementLabelMax           , IntAry1d (256,0) ,16            , "OverlayElementLabelMax"           )        
+    ("OverlayLanguage_%d"             , m_overlayLanguage                  , std::string(""), 16             , "OverlayLanguage"                  )
+    ("OverlayName_%d"                 , m_overlayName                      , std::string(""), 16             , "OverlayName"                      )
+    ("OverlayElementName_%d_%d"       , m_overlayElementName               , std::string(""), 256 ,16        , "OverlayElementName"               )
     ("OverlayInfoPersistenceFlag"     , m_overlayInfoPersistenceFlag       , false                           , "OverlayInfoPersistenceFlag"       )
     ; 
@@ -813,5 +817,5 @@
 
   // Initialize some values for syntax elements with declaration type st(v) (i.e. string type syntax elements)
-  initStringElements();
+  // initStringElements();
 };
 
@@ -1469,5 +1473,5 @@
 
 
-
+#if NH_3D
 Void SEIAlternativeDepthInfo::setupFromCfgFile(const Char* cfgFile)
 { 
@@ -1549,6 +1553,4 @@
   po::parseConfigFile( opts, cfgFile, err );
 };
-
-
 Bool SEIAlternativeDepthInfo::checkCfg( const TComSlice* slice )
 { 
@@ -1611,5 +1613,5 @@
 
 };
-
-
 #endif
+
+#endif
Index: branches/HTM-15.1-dev0-Disney/source/Lib/TLibCommon/SEI.h
===================================================================
--- branches/HTM-15.1-dev0-Disney/source/Lib/TLibCommon/SEI.h	(revision 1343)
+++ branches/HTM-15.1-dev0-Disney/source/Lib/TLibCommon/SEI.h	(revision 1344)
@@ -835,7 +835,7 @@
   IntAry2d  m_overlayElementLabelMin;
   IntAry2d  m_overlayElementLabelMax;  
-  std::vector< std::string >  m_overlayLanguage;
-  std::vector< std::string >  m_overlayName;
-  std::vector< std::vector< std::string > >  m_overlayElementName;
+  StringAry1d  m_overlayLanguage;
+  StringAry1d  m_overlayName;
+  StringAry2d  m_overlayElementName;
   Bool      m_overlayInfoPersistenceFlag;
 };
@@ -981,5 +981,5 @@
 
         }
-        int m_currLayerID;
+        Int m_currLayerID;
         BoolAry1d      m_zNearFlag;
         BoolAry1d      m_zFarFlag;
@@ -992,5 +992,5 @@
         IntAry2d       m_disparityRefViewId;
         IntAry2d       m_depthNonlinearRepresentationNumMinus1;
-        IntAry2d m_depth_nonlinear_representation_model;
+        IntAry2d       m_depth_nonlinear_representation_model;
 };
 #endif
@@ -1140,5 +1140,5 @@
 };
 
-
+#if NH_3D
 class SEIAlternativeDepthInfo : public SEI
 {
@@ -1207,5 +1207,5 @@
 };
 
-
+#endif
 #endif
 
Index: branches/HTM-15.1-dev0-Disney/source/Lib/TLibCommon/TComRom.cpp
===================================================================
--- branches/HTM-15.1-dev0-Disney/source/Lib/TLibCommon/TComRom.cpp	(revision 1343)
+++ branches/HTM-15.1-dev0-Disney/source/Lib/TLibCommon/TComRom.cpp	(revision 1344)
@@ -537,5 +537,5 @@
 const Bool g_bEncDecTraceEnable  = true;
 const Bool g_bEncDecTraceDisable = false;
-Bool   g_HLSTraceEnable = false;
+Bool   g_HLSTraceEnable = true;
 Bool   g_bJustDoIt = false;
 UInt64 g_nSymbolCounter = 0;
@@ -544,5 +544,5 @@
 Bool g_tracePU = false; 
 Bool g_traceTU = false; 
-Bool g_disableNumbering = false; 
+Bool g_disableNumbering = true; 
 Bool g_disableHLSTrace = false; 
 UInt64 g_stopAtCounter       = 4660; 
Index: branches/HTM-15.1-dev0-Disney/source/Lib/TLibCommon/TComRom.h
===================================================================
--- branches/HTM-15.1-dev0-Disney/source/Lib/TLibCommon/TComRom.h	(revision 1343)
+++ branches/HTM-15.1-dev0-Disney/source/Lib/TLibCommon/TComRom.h	(revision 1344)
@@ -153,5 +153,5 @@
 // Change later
 #ifndef ENC_DEC_TRACE
-#define ENC_DEC_TRACE 0
+#define ENC_DEC_TRACE 1
 #endif
 #endif
Index: branches/HTM-15.1-dev0-Disney/source/Lib/TLibCommon/TypeDef.h
===================================================================
--- branches/HTM-15.1-dev0-Disney/source/Lib/TLibCommon/TypeDef.h	(revision 1343)
+++ branches/HTM-15.1-dev0-Disney/source/Lib/TLibCommon/TypeDef.h	(revision 1344)
@@ -492,4 +492,6 @@
 #endif
 #if NH_MV                         
+typedef std::vector< std::string > StringAry1d; 
+typedef std::vector< StringAry1d > StringAry2d; 
 typedef std::vector< Int >        IntAry1d;
 typedef std::vector< IntAry1d >   IntAry2d; 
