Index: branches/HTM-DEV-0.1-dev/source/Lib/TAppCommon/program_options_lite.h
===================================================================
--- branches/HTM-DEV-0.1-dev/source/Lib/TAppCommon/program_options_lite.h	(revision 363)
+++ branches/HTM-DEV-0.1-dev/source/Lib/TAppCommon/program_options_lite.h	(revision 364)
@@ -46,5 +46,4 @@
 #endif
 #endif
-
 //! \ingroup TAppCommon
 //! \{
@@ -382,5 +381,4 @@
       }
 #endif
-
       /**
        * Add option described by name to the parent Options list,
Index: branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/CommonDef.h
===================================================================
--- branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/CommonDef.h	(revision 363)
+++ branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/CommonDef.h	(revision 364)
@@ -168,5 +168,4 @@
 
 #endif
-
 
 // ====================================================================================================================
Index: branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/NAL.h
===================================================================
--- branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/NAL.h	(revision 363)
+++ branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/NAL.h	(revision 364)
@@ -47,5 +47,4 @@
   NalUnitType m_nalUnitType; ///< nal_unit_type
   UInt        m_temporalId;  ///< temporal_id
-
 #if H_MV
   Int         m_layerId;     ///< layer id
Index: branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/TComDataCU.cpp
===================================================================
--- branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/TComDataCU.cpp	(revision 363)
+++ branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/TComDataCU.cpp	(revision 364)
@@ -3200,5 +3200,4 @@
   Bool bIsCurrRefLongTerm = m_pcSlice->getRefPic( eRefPicList, iRefIdx)->getIsLongTerm();
   Bool bIsNeibRefLongTerm = false;
-
   //---------------  V1 (END) ------------------//
   if( pcTmpCU->getCUMvField(eRefPicList)->getRefIdx(uiIdx) >= 0)
Index: branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/TComPic.h
===================================================================
--- branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/TComPic.h	(revision 363)
+++ branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/TComPic.h	(revision 364)
@@ -93,5 +93,4 @@
 #endif
 #endif
-
 public:
   TComPic();
@@ -116,5 +115,4 @@
 #endif
 #endif
-
   Bool          getUsedByCurr()             { return m_bUsedByCurr; }
   Void          setUsedByCurr( Bool bUsed ) { m_bUsedByCurr = bUsed; }
@@ -186,7 +184,4 @@
   Void          print( Bool legend );
 #endif
-
-
-
   /** transfer ownership of seis to this picture */
   void setSEIs(SEIMessages& seis) { m_SEIs = seis; }
Index: branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/TComSlice.h
===================================================================
--- branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/TComSlice.h	(revision 363)
+++ branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/TComSlice.h	(revision 364)
@@ -603,5 +603,4 @@
   TimingInfo* getTimingInfo() { return &m_timingInfo; }
 #endif
-
 #if H_MV
   Void    setAvcBaseLayerFlag( Bool val )                                  { m_avcBaseLayerFlag = val;  }
@@ -971,9 +970,7 @@
   static const Int   m_winUnitY[MAX_CHROMA_FORMAT_IDC+1];
   TComPTL     m_pcPTL;
-
 #if H_MV
   Bool        m_interViewMvVertConstraintFlag;
 #endif
-
 public:
   TComSPS();
@@ -1106,5 +1103,4 @@
 
   TComPTL* getPTL()     { return &m_pcPTL; }
-
 #if H_MV
   Void setInterViewMvVertConstraintFlag(Bool val) { m_interViewMvVertConstraintFlag = val; }
@@ -1464,5 +1460,4 @@
 
   Bool       m_enableTMVPFlag;
-
 #if H_MV
   Int        m_layerId; 
@@ -1472,5 +1467,4 @@
 #endif
 #endif
-
 public:
   TComSlice();
@@ -1639,5 +1633,4 @@
   Void decodingMarking( TComList<TComPic*>& rcListPic, Int iGOPSIze, Int& iMaxRefPicNum ); 
   Void applyReferencePictureSet( TComList<TComPic*>& rcListPic, TComReferencePictureSet *RPSList);
-
 #if H_MV
   Void createAndApplyIvReferencePictureSet( TComPicLists* ivPicLists, std::vector<TComPic*>& refPicSetInterLayer );
@@ -1648,5 +1641,4 @@
   Void xPrintRefPicList();
 #endif
-
   Bool isTemporalLayerSwitchingPoint( TComList<TComPic*>& rcListPic );
   Bool isStepwiseTemporalLayerSwitchingPointCandidate( TComList<TComPic*>& rcListPic );
Index: branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/TypeDef.h
===================================================================
--- branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/TypeDef.h	(revision 363)
+++ branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/TypeDef.h	(revision 364)
@@ -91,5 +91,4 @@
 #define MAX_VPS_NUM_HRD_PARAMETERS                1
 #define MAX_VPS_OP_SETS_PLUS1                     1024
-
 #if H_MV
 #define MAX_VPS_NUH_LAYER_ID_PLUS1  64
@@ -105,5 +104,7 @@
 #define MAX_CPB_CNT                     32  ///< Upper bound of (cpb_cnt_minus1 + 1)
 #define MAX_NUM_LAYER_IDS               64
+#if H_MV
 #define MAX_NUM_LAYERS                  64
+#endif
 
 #define COEF_REMAIN_BIN_REDUCTION        3 ///< indicates the level at which the VLC 
@@ -569,3 +570,2 @@
 #endif
 #endif
-
Index: branches/HTM-DEV-0.1-dev/source/Lib/TLibDecoder/TDecGop.cpp
===================================================================
--- branches/HTM-DEV-0.1-dev/source/Lib/TLibDecoder/TDecGop.cpp	(revision 363)
+++ branches/HTM-DEV-0.1-dev/source/Lib/TLibDecoder/TDecGop.cpp	(revision 364)
@@ -208,10 +208,8 @@
   rpcPic->compressMotion(); 
 #endif
-
   Char c = (pcSlice->isIntra() ? 'I' : pcSlice->isInterP() ? 'P' : 'B');
   if (!pcSlice->isReferenced()) c += 32;
 
   //-- For time output for each slice
-
 #if H_MV
   printf("\nLayer %2d   POC %4d TId: %1d ( %c-SLICE, QP%3d ) ", pcSlice->getLayerId(),
Index: branches/HTM-DEV-0.1-dev/source/Lib/TLibDecoder/TDecTop.cpp
===================================================================
--- branches/HTM-DEV-0.1-dev/source/Lib/TLibDecoder/TDecTop.cpp	(revision 363)
+++ branches/HTM-DEV-0.1-dev/source/Lib/TLibDecoder/TDecTop.cpp	(revision 364)
@@ -93,5 +93,4 @@
 }
 
-
 Void TDecTop::init()
 {
@@ -100,5 +99,4 @@
   initROM();
 #endif
-
   m_cGopDecoder.init( &m_cEntropyDecoder, &m_cSbacDecoder, &m_cBinCABAC, &m_cCavlcDecoder, &m_cSliceDecoder, &m_cLoopFilter, &m_cSAO);
   m_cSliceDecoder.init( &m_cEntropyDecoder, &m_cCuDecoder );
@@ -222,10 +220,8 @@
   rpcListPic          = &m_cListPic;  
   m_cCuDecoder.destroy();        
-
 #if H_MV 
   TComSlice::markIvRefPicsAsShortTerm( m_refPicSetInterLayer );  
   TComSlice::markIvRefPicsAsUnused   ( m_ivPicLists, targetDecLayerIdSet, m_parameterSetManagerDecoder.getActiveVPS(), m_layerId, poc ); 
 #endif
-
   m_bFirstSliceInPicture  = true;
 
@@ -380,5 +376,4 @@
   m_apcSlicePilot->setLayerId( nalu.m_layerId );
 #endif
-
   m_cEntropyDecoder.decodeSliceHeader (m_apcSlicePilot, &m_parameterSetManagerDecoder);
 
Index: branches/HTM-DEV-0.1-dev/source/Lib/TLibDecoder/TDecTop.h
===================================================================
--- branches/HTM-DEV-0.1-dev/source/Lib/TLibDecoder/TDecTop.h	(revision 363)
+++ branches/HTM-DEV-0.1-dev/source/Lib/TLibDecoder/TDecTop.h	(revision 364)
@@ -64,5 +64,4 @@
 class TAppDecTop;
 #endif
-
 /// decoder class
 class TDecTop
@@ -81,5 +80,4 @@
   ParameterSetManagerDecoder m_parameterSetManagerDecoder;  // storage for parameter sets 
 #endif
-
   TComSlice*              m_apcSlicePilot;
   
Index: branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncCfg.h
===================================================================
--- branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncCfg.h	(revision 363)
+++ branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncCfg.h	(revision 364)
@@ -406,5 +406,4 @@
 #endif
 #endif
-
   //====== Coding Structure ========
   Void      setIntraPeriod                  ( Int   i )      { m_uiIntraPeriod = (UInt)i; }
Index: branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncGOP.cpp
===================================================================
--- branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncGOP.cpp	(revision 363)
+++ branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncGOP.cpp	(revision 364)
@@ -410,5 +410,4 @@
   UInt *accumNalsDU = NULL;
   SEIDecodingUnitInfo decodingUnitInfoSEI;
-
 #if !H_MV
   for ( Int iGOPid=0; iGOPid < m_iGopSize; iGOPid++ )
@@ -472,5 +471,4 @@
     if(pocCurr>=m_pcCfg->getFramesToBeEncoded())
     {
-
 #if H_MV
       delete pcBitstreamRedirect;
@@ -2057,5 +2055,4 @@
   assert ( m_iNumPicCoded == iNumPicRcvd );
 #endif
-
 }
 
@@ -2377,5 +2374,4 @@
   m_gcAnalyzeAll.addResult (dYPSNR, dUPSNR, dVPSNR, (Double)uibits);
 #endif
-
   TComSlice*  pcSlice = pcPic->getSlice(0);
   if (pcSlice->isIntra())
@@ -2386,5 +2382,4 @@
     m_gcAnalyzeI.addResult (dYPSNR, dUPSNR, dVPSNR, (Double)uibits);
 #endif
-
   }
   if (pcSlice->isInterP())
Index: branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncGOP.h
===================================================================
--- branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncGOP.h	(revision 363)
+++ branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncGOP.h	(revision 364)
@@ -108,5 +108,4 @@
 #endif
 #endif
-
   //--Adaptive Loop filter
   TEncSampleAdaptiveOffset*  m_pcSAO;
Index: branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncTop.h
===================================================================
--- branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncTop.h	(revision 363)
+++ branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncTop.h	(revision 364)
@@ -63,6 +63,4 @@
 // Class definition
 // ====================================================================================================================
-
-
 
 /// encoder class
@@ -133,5 +131,4 @@
   TEncAnalyze             m_cAnalyzeB;  
 #endif
-
 protected:
   Void  xGetNewPicBuffer  ( TComPic*& rpcPic );           ///< get picture buffer which will be processed
@@ -148,11 +145,8 @@
   Void      create          ();
   Void      destroy         ();
-
   Void      init            ();
-
 #if H_MV  
   TComPicLists* getIvPicLists() { return m_ivPicLists; }
 #endif
-
   Void      deletePicBuffer ();
 
@@ -162,5 +156,4 @@
   Void      initNewPic(TComPicYuv* pcPicYuvOrg);
 #endif
-
   // -------------------------------------------------------------------------------------------------------------------
   // member access functions
