Index: branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/NALwrite.cpp
===================================================================
--- branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/NALwrite.cpp	(revision 366)
+++ branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/NALwrite.cpp	(revision 367)
@@ -53,9 +53,5 @@
   bsNALUHeader.write(0,1);                    // forbidden_zero_bit
   bsNALUHeader.write(nalu.m_nalUnitType, 6);  // nal_unit_type
-#if H_MV
-  bsNALUHeader.write(nalu.m_layerId, 6);      // layerId       
-#else
   bsNALUHeader.write(nalu.m_reservedZero6Bits, 6);                   // nuh_reserved_zero_6bits
-#endif
   bsNALUHeader.write(nalu.m_temporalId+1, 3); // nuh_temporal_id_plus1
 
@@ -146,9 +142,5 @@
 {
   naluDest.m_nalUnitType = naluSrc.m_nalUnitType;
-#if H_MV
-  naluDest.m_layerId  = naluSrc.m_layerId;
-#else
   naluDest.m_reservedZero6Bits  = naluSrc.m_reservedZero6Bits;
-#endif
   naluDest.m_temporalId  = naluSrc.m_temporalId;
   naluDest.m_Bitstream   = naluSrc.m_Bitstream;
Index: branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/NALwrite.h
===================================================================
--- branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/NALwrite.h	(revision 366)
+++ branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/NALwrite.h	(revision 367)
@@ -57,14 +57,6 @@
     NalUnitType nalUnitType,
     UInt temporalID = 0,
-#if H_MV
-    Int layerId = 0)
-#else
     UInt reserved_zero_6bits = 0)
-#endif
-#if H_MV
-  : NALUnit(nalUnitType, temporalID, layerId)
-#else
   : NALUnit(nalUnitType, temporalID, reserved_zero_6bits)
-#endif
   , m_Bitstream()
   {}
Index: branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncAnalyze.cpp
===================================================================
--- branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncAnalyze.cpp	(revision 366)
+++ branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncAnalyze.cpp	(revision 367)
@@ -36,7 +36,5 @@
 */
 
-#if !H_MV
 #include "TEncAnalyze.h"
-#endif
 
 //! \ingroup TLibEncoder
@@ -47,10 +45,8 @@
 //////////////////////////////////////////////////////////////////////
 
-#if !H_MV
 TEncAnalyze             m_gcAnalyzeAll;
 TEncAnalyze             m_gcAnalyzeI;
 TEncAnalyze             m_gcAnalyzeP;
 TEncAnalyze             m_gcAnalyzeB;
-#endif
 
 //! \}
Index: branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncAnalyze.h
===================================================================
--- branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncAnalyze.h	(revision 366)
+++ branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncAnalyze.h	(revision 367)
@@ -150,10 +150,8 @@
 };
 
-#if !H_MV
 extern TEncAnalyze             m_gcAnalyzeAll;
 extern TEncAnalyze             m_gcAnalyzeI;
 extern TEncAnalyze             m_gcAnalyzeP;
 extern TEncAnalyze             m_gcAnalyzeB;
-#endif
 
 //! \}
Index: branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncCavlc.cpp
===================================================================
--- branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncCavlc.cpp	(revision 366)
+++ branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncCavlc.cpp	(revision 367)
@@ -549,11 +549,5 @@
   }
 
-#if H_MV
-  WRITE_FLAG( 1, "sps_extension_flag" );
-
-  WRITE_FLAG( pcSPS->getInterViewMvVertConstraintFlag() ? 1 : 0, "inter_view_mv_vert_constraint_flag" );
-#else
   WRITE_FLAG( 0, "sps_extension_flag" );
-#endif
 }
 
@@ -562,17 +556,9 @@
   WRITE_CODE( pcVPS->getVPSId(),                    4,        "vps_video_parameter_set_id" );
   WRITE_CODE( 3,                                    2,        "vps_reserved_three_2bits" );
-#if H_MV
-  WRITE_CODE( pcVPS->getMaxLayers() - 1,            6,        "vps_max_layers_minus1" );
-#else
   WRITE_CODE( 0,                                    6,        "vps_reserved_zero_6bits" );
-#endif
   WRITE_CODE( pcVPS->getMaxTLayers() - 1,           3,        "vps_max_sub_layers_minus1" );
   WRITE_FLAG( pcVPS->getTemporalNestingFlag(),                "vps_temporal_id_nesting_flag" );
   assert (pcVPS->getMaxTLayers()>1||pcVPS->getTemporalNestingFlag());
-#if H_MV
-  WRITE_CODE( 0xffff,                              16,        "vps_extension_offset" );
-#else
   WRITE_CODE( 0xffff,                              16,        "vps_reserved_ffff_16bits" );
-#endif
   codePTL( pcVPS->getPTL(), true, pcVPS->getMaxTLayers() - 1 );
 #if SIGNAL_BITRATE_PICRATE_IN_VPS
@@ -597,11 +583,6 @@
 
   assert( pcVPS->getNumHrdParameters() <= MAX_VPS_NUM_HRD_PARAMETERS );
-#if H_MV
-  assert( pcVPS->getMaxNuhLayerId() < MAX_VPS_NUH_LAYER_ID_PLUS1 );
-  WRITE_CODE( pcVPS->getMaxNuhLayerId(), 6,                 "vps_max_nuh_layer_id" );
-#else
   assert( pcVPS->getMaxNuhReservedZeroLayerId() < MAX_VPS_NUH_RESERVED_ZERO_LAYER_ID_PLUS1 );
   WRITE_CODE( pcVPS->getMaxNuhReservedZeroLayerId(), 6,     "vps_max_nuh_reserved_zero_layer_id" );
-#endif
   pcVPS->setMaxOpSets(1);
   WRITE_UVLC( pcVPS->getMaxOpSets() - 1,                    "vps_max_op_sets_minus1" );
@@ -609,9 +590,5 @@
   {
     // Operation point set
-#if H_MV
-    for( UInt i = 0; i <= pcVPS->getMaxNuhLayerId(); i ++ )
-#else
     for( UInt i = 0; i <= pcVPS->getMaxNuhReservedZeroLayerId(); i ++ )
-#endif
     {
       // Only applicable for version 1
@@ -654,69 +631,5 @@
   }
 #endif
-#if H_MV
-  WRITE_FLAG( 1,                                             "vps_extension_flag" );
-
-  m_pcBitIf->writeAlignOne();                        
-
-  WRITE_FLAG( pcVPS->getAvcBaseLayerFlag() ? 1 : 0,          "avc_base_layer_flag" );
-  WRITE_FLAG( pcVPS->getSplittingFlag() ? 1 : 0,             "splitting_flag" );
-  
-  for( Int type = 0; type < MAX_NUM_SCALABILITY_TYPES; type++ )
-  {
-    WRITE_FLAG( pcVPS->getScalabilityMask( type ) ? 1 : 0,   "scalability_mask[i]" );
-  }
-
-  for( Int sIdx = 0; sIdx < pcVPS->getNumScalabilityTypes( ); sIdx++ )
-  {
-    WRITE_CODE( pcVPS->getDimensionIdLen( sIdx ) - 1 , 3,    "dimension_id_len_minus1[j]");    
-  }
-
-  WRITE_FLAG( pcVPS->getVpsNuhLayerIdPresentFlag() ? 1 : 0,  "vps_nuh_layer_id_present_flag");
-
-  for( Int layer = 1; layer <= pcVPS->getMaxLayers() - 1; layer++ )
-  {
-    if (pcVPS->getVpsNuhLayerIdPresentFlag() )
-      WRITE_CODE( pcVPS->getLayerIdInNuh( layer ), 6,          "layer_id_in_nuh[i]");
-    for( Int sIdx = 0; sIdx < pcVPS->getNumScalabilityTypes() ; sIdx++ )
-    {      
-      WRITE_CODE( pcVPS->getDimensionId( layer, sIdx ), pcVPS->getDimensionIdLen( sIdx ), "dimension_id[i][j]");      
-    }
-  }
-
-  for( Int layerSet = 1; layerSet <= pcVPS->getMaxOpSets() - 1; layerSet++ )
-  {
-    WRITE_FLAG( pcVPS->getVpsProfilePresentFlag( layerSet ) ? 1 : 0, "vps_profile_present_flag[lsIdx]" );
-    if( pcVPS->getVpsProfilePresentFlag( layerSet ) == false )
-    {
-      WRITE_UVLC( pcVPS->getProfileLayerSetRefMinus1( layerSet ), "profile_layer_set_ref_minus1[lsIdx]" );
-    }
-    codePTL( pcVPS->getPTL( layerSet ), pcVPS->getVpsProfilePresentFlag( layerSet ), pcVPS->getMaxTLayers() - 1 );
-  }
-
-  WRITE_UVLC( pcVPS->getNumOutputLayerSets(),                "num_output_layer_sets" );
-
-  for( Int layerSet = 0; layerSet < pcVPS->getNumOutputLayerSets(); layerSet++ )
-  {
-    WRITE_UVLC( pcVPS->getOutputLayerSetIdx( layerSet ),      "output_layer_set_idx[i]" );
-    for( Int layer = 0; layer <= pcVPS->getMaxNuhLayerId(); layer++ )
-    {
-      if( pcVPS->getLayerIdIncludedFlag( pcVPS->getOutputLayerSetIdx( layerSet ), layer ) == true )
-      {
-        WRITE_FLAG( pcVPS->getOutputLayerFlag( layerSet, layer ) ? 1 : 0, "output_layer_flag" );
-      }
-    }
-  }
-
-  for( Int i = 1; i <= pcVPS->getMaxLayers() - 1; i++ )
-  {
-    for( Int j = 0; j < i; j++ )
-    {
-      WRITE_FLAG( pcVPS->getDirectDependencyFlag( i, j ),    "direct_dependency_flag[i][j]" );
-    }
-  }
-  WRITE_FLAG( 0,                                             "vps_extension2_flag" );
-#else
   WRITE_FLAG( 0,                     "vps_extension_flag" );
-#endif
   
   //future extensions here..
@@ -1091,12 +1004,8 @@
   for (Int i = 0; i < maxNumSubLayersMinus1; i++)
   {
-#if !H_MV
     if(profilePresentFlag)
     {
-#endif
       WRITE_FLAG( pcPTL->getSubLayerProfilePresentFlag(i), "sub_layer_profile_present_flag[i]" );
-#if !H_MV
-    }
-#endif
+    }
     
     WRITE_FLAG( pcPTL->getSubLayerLevelPresentFlag(i),   "sub_layer_level_present_flag[i]" );
Index: branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncCfg.h
===================================================================
--- branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncCfg.h	(revision 366)
+++ branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncCfg.h	(revision 367)
@@ -69,9 +69,4 @@
   Int m_numRefIdc;
   Int m_refIdc[MAX_NUM_REF_PICS+1];
-#if H_MV
-  Int m_numInterViewRefPics;
-  Int m_interViewRefs    [MAX_NUM_REF_PICS];
-  Int m_interViewRefPosL[2][MAX_NUM_REF_PICS];  
-#endif
   GOPEntry()
   : m_POC(-1)
@@ -88,15 +83,8 @@
   , m_deltaRPS(0)
   , m_numRefIdc(0)
-#if H_MV
-  , m_numInterViewRefPics(0)
-#endif
   {
     ::memset( m_referencePics, 0, sizeof(m_referencePics) );
     ::memset( m_usedByCurrPic, 0, sizeof(m_usedByCurrPic) );
     ::memset( m_refIdc,        0, sizeof(m_refIdc) );
-#if H_MV
-    ::memset( m_interViewRefs,   0, sizeof(m_interViewRefs) );
-    ::memset( m_interViewRefPosL[0], -1, sizeof(m_interViewRefPosL[0]) );    ::memset( m_interViewRefPosL[1], -1, sizeof(m_interViewRefPosL[1]) );
-#endif
   }
 };
@@ -139,9 +127,5 @@
   UInt      m_uiDecodingRefreshType;            ///< the type of decoding refresh employed for the random access.
   Int       m_iGOPSize;
-#if H_MV
-  GOPEntry  m_GOPList[MAX_GOP+1];
-#else
   GOPEntry  m_GOPList[MAX_GOP];
-#endif
   Int       m_extraRPSs;
   Int       m_maxDecPicBuffering[MAX_TLAYER];
@@ -353,24 +337,8 @@
   Bool      m_useStrongIntraSmoothing;                        ///< enable the use of strong intra smoothing (bi_linear interpolation) for 32x32 blocks when reference samples are flat.
 
-#if H_MV
-  Int       m_layerId;
-  Int       m_layerIdInVps;
-  Int       m_viewId;
-#if H_3D
-  Bool      m_isDepth;
-#endif
-#endif
 public:
   TEncCfg()
   : m_puiColumnWidth()
   , m_puiRowHeight()
-#if H_MV
-  , m_layerId(-1)
-  , m_layerIdInVps(-1)
-  , m_viewId(-1)
-#if H_3D
-  , m_isDepth(false)
-#endif
-#endif
   {}
 
@@ -394,25 +362,9 @@
   Void      setFramesToBeEncoded            ( Int   i )      { m_framesToBeEncoded = i; }
   
-#if H_MV
-  Void      setLayerId                       ( Int layerId )      { m_layerId = layerId; }
-  Int       getLayerId                       ()                   { return m_layerId;    }
-  Int       getLayerIdInVps                  ()                   { return m_layerIdInVps; }
-  Void      setLayerIdInVps                  ( Int layerIdInVps)  { m_layerIdInVps = layerIdInVps; }
-  Void      setViewId                        ( Int viewId  )      { m_viewId  = viewId;  }
-  Int       getViewId                        ()                   { return m_viewId;    }
-#if H_3D
-  Void      setIsDepth                       ( Bool isDepth )   { m_isDepth = isDepth; }
-  Bool      getIsDepth                       ()                 { return m_isDepth; }
-#endif
-#endif
   //====== Coding Structure ========
   Void      setIntraPeriod                  ( Int   i )      { m_uiIntraPeriod = (UInt)i; }
   Void      setDecodingRefreshType          ( Int   i )      { m_uiDecodingRefreshType = (UInt)i; }
   Void      setGOPSize                      ( Int   i )      { m_iGOPSize = i; }
-#if H_MV
-  Void      setGopList                      ( GOPEntry*  GOPList ) {  for ( Int i = 0; i < MAX_GOP+1; i++ ) m_GOPList[i] = GOPList[i]; }
-#else
   Void      setGopList                      ( GOPEntry*  GOPList ) {  for ( Int i = 0; i < MAX_GOP; i++ ) m_GOPList[i] = GOPList[i]; }
-#endif
   Void      setExtraRPSs                    ( Int   i )      { m_extraRPSs = i; }
   GOPEntry  getGOPEntry                     ( Int   i )      { return m_GOPList[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 366)
+++ branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncGOP.cpp	(revision 367)
@@ -100,12 +100,4 @@
 #endif
 #endif
-#if H_MV
-  m_layerId      = 0;
-  m_viewId       = 0;
-  m_pocLastCoded = -1; 
-#if H_3D
-  m_isDepth = false;
-#endif
-#endif
   return;
 }
@@ -147,12 +139,4 @@
   m_totalCoded         = 0;
 
-#if H_MV
-  m_ivPicLists           = pcTEncTop->getIvPicLists(); 
-  m_layerId              = pcTEncTop->getLayerId();
-  m_viewId               = pcTEncTop->getViewId();
-#if H_3D
-  m_isDepth              = pcTEncTop->getIsDepth();
-#endif
-#endif
 }
 
@@ -358,16 +342,5 @@
 // Public member functions
 // ====================================================================================================================
-#if H_MV
-Void TEncGOP::initGOP( Int iPOCLast, Int iNumPicRcvd, TComList<TComPic*>& rcListPic, TComList<TComPicYuv*>& rcListPicYuvRecOut, std::list<AccessUnit>& accessUnitsInGOP)
-{
-  xInitGOP( iPOCLast, iNumPicRcvd, rcListPic, rcListPicYuvRecOut );
-  m_iNumPicCoded = 0;
-}
-#endif
-#if H_MV
-Void TEncGOP::compressPicInGOP( Int iPOCLast, Int iNumPicRcvd, TComList<TComPic*>& rcListPic, TComList<TComPicYuv*>& rcListPicYuvRecOut, std::list<AccessUnit>& accessUnitsInGOP, Int iGOPid)
-#else
 Void TEncGOP::compressGOP( Int iPOCLast, Int iNumPicRcvd, TComList<TComPic*>& rcListPic, TComList<TComPicYuv*>& rcListPicYuvRecOut, std::list<AccessUnit>& accessUnitsInGOP)
-#endif
 {
   TComPic*        pcPic;
@@ -381,9 +354,7 @@
   TComOutputBitstream* pcSubstreamsOut = NULL;
 
-#if !H_MV
   xInitGOP( iPOCLast, iNumPicRcvd, rcListPic, rcListPicYuvRecOut );
   
   m_iNumPicCoded = 0;
-#endif
   SEIPictureTiming pictureTimingSEI;
 #if L0208_SOP_DESCRIPTION_SEI
@@ -408,7 +379,5 @@
   UInt *accumNalsDU = NULL;
   SEIDecodingUnitInfo decodingUnitInfoSEI;
-#if !H_MV
   for ( Int iGOPid=0; iGOPid < m_iGopSize; iGOPid++ )
-#endif
   {
     UInt uiColDir = 1;
@@ -469,10 +438,5 @@
     if(pocCurr>=m_pcCfg->getFramesToBeEncoded())
     {
-#if H_MV
-      delete pcBitstreamRedirect;
-      return;
-#else
       continue;
-#endif
     }
 
@@ -495,15 +459,4 @@
     pcSlice->setLastIDR(m_iLastIDR);
     pcSlice->setSliceIdx(0);
-#if H_MV
-    pcPic  ->setLayerId     ( getLayerId() );
-    pcPic  ->setViewId      ( getViewId()  );
-    pcSlice->setLayerId     ( getLayerId() );
-    pcSlice->setViewId      ( getViewId()  );
-    pcSlice->setVPS         ( m_pcEncTop->getVPS() );
-#if H_3D
-    pcPic  ->setIsDepth( getIsDepth() );
-    pcSlice->setIsDepth( getIsDepth() );
-#endif
-#endif
     //set default slice level flag to the same as SPS level flag
     pcSlice->setLFCrossSliceBoundaryFlag(  pcSlice->getPPS()->getLoopFilterAcrossSlicesEnabledFlag()  );
@@ -543,22 +496,10 @@
     }
 
-#if H_MV
+    if(pcSlice->getSliceType()==B_SLICE&&m_pcCfg->getGOPEntry(iGOPid).m_sliceType=='P')
+    {
+      pcSlice->setSliceType(P_SLICE);
+    }
     // Set the nal unit type
     pcSlice->setNalUnitType(getNalUnitType(pocCurr, m_iLastIDR));
-    if( pcSlice->getSliceType() == B_SLICE )
-    {
-      if( m_pcCfg->getGOPEntry( ( pcSlice->getRapPicFlag() && getLayerId() > 0 ) ? MAX_GOP : iGOPid ).m_sliceType == 'P' ) 
-      { 
-        pcSlice->setSliceType( P_SLICE );
-      }
-    }
-#else
-    if(pcSlice->getSliceType()==B_SLICE&&m_pcCfg->getGOPEntry(iGOPid).m_sliceType=='P')
-    {
-      pcSlice->setSliceType(P_SLICE);
-    }
-    // Set the nal unit type
-    pcSlice->setNalUnitType(getNalUnitType(pocCurr, m_iLastIDR));
-#endif
     if(pcSlice->getTemporalLayerNonReferenceFlag())
     {
@@ -648,13 +589,6 @@
     refPicListModification->setRefPicListModificationFlagL0(0);
     refPicListModification->setRefPicListModificationFlagL1(0);
-#if H_MV
-    pcSlice->createAndApplyIvReferencePictureSet( m_ivPicLists, m_refPicSetInterLayer ); 
-    pcSlice->setNumRefIdx(REF_PIC_LIST_0,min(m_pcCfg->getGOPEntry( (pcSlice->getRapPicFlag() && getLayerId() > 0) ? MAX_GOP : iGOPid ).m_numRefPicsActive,( pcSlice->getRPS()->getNumberOfPictures() + (Int) m_refPicSetInterLayer.size() ) ) );
-    pcSlice->setNumRefIdx(REF_PIC_LIST_1,min(m_pcCfg->getGOPEntry( (pcSlice->getRapPicFlag() && getLayerId() > 0) ? MAX_GOP : iGOPid ).m_numRefPicsActive,( pcSlice->getRPS()->getNumberOfPictures() + (Int) m_refPicSetInterLayer.size() ) ) );
-    xSetRefPicListModificationsMvc( pcSlice, pocCurr, iGOPid );    
-#else
     pcSlice->setNumRefIdx(REF_PIC_LIST_0,min(m_pcCfg->getGOPEntry(iGOPid).m_numRefPicsActive,pcSlice->getRPS()->getNumberOfPictures()));
     pcSlice->setNumRefIdx(REF_PIC_LIST_1,min(m_pcCfg->getGOPEntry(iGOPid).m_numRefPicsActive,pcSlice->getRPS()->getNumberOfPictures()));
-#endif
 
 #if ADAPTIVE_QP_SELECTION
@@ -663,25 +597,11 @@
 
     //  Set reference list
-#if H_MV    
-    pcSlice->setRefPicList( rcListPic, m_refPicSetInterLayer );
-#else
     pcSlice->setRefPicList ( rcListPic );
-#endif
 
     //  Slice info. refinement
-#if H_MV
-    if ( pcSlice->getSliceType() == B_SLICE )
-    {
-      if( m_pcCfg->getGOPEntry( ( pcSlice->getRapPicFlag() == true && getLayerId() > 0 ) ? MAX_GOP : iGOPid ).m_sliceType == 'P' ) 
-      { 
-        pcSlice->setSliceType( P_SLICE ); 
-      }
-    }
-#else
     if ( (pcSlice->getSliceType() == B_SLICE) && (pcSlice->getNumRefIdx(REF_PIC_LIST_1) == 0) )
     {
       pcSlice->setSliceType ( P_SLICE );
     }
-#endif
 #if !L0034_COMBINED_LIST_CLEANUP
     if (pcSlice->getSliceType() != B_SLICE || !pcSlice->getSPS()->getUseLComb())
@@ -1100,8 +1020,4 @@
     {
       OutputNALUnit nalu(NAL_UNIT_VPS);
-#if H_MV
-      if( getLayerId() == 0 )
-      {
-#endif
       m_pcEntropyCoder->setBitstream(&nalu.m_Bitstream);
       m_pcEntropyCoder->encodeVPS(m_pcEncTop->getVPS());
@@ -1112,10 +1028,5 @@
 #endif
 
-#if H_MV
-      }
-      nalu = NALUnit(NAL_UNIT_SPS, 0, getLayerId());
-#else
       nalu = NALUnit(NAL_UNIT_SPS);
-#endif
       m_pcEntropyCoder->setBitstream(&nalu.m_Bitstream);
       if (m_bSeqFirst)
@@ -1150,9 +1061,5 @@
 #endif
 
-#if H_MV
-      nalu = NALUnit(NAL_UNIT_PPS, 0, getLayerId());
-#else
       nalu = NALUnit(NAL_UNIT_PPS);
-#endif
       m_pcEntropyCoder->setBitstream(&nalu.m_Bitstream);
       m_pcEntropyCoder->encodePPS(pcSlice->getPPS());
@@ -1476,9 +1383,5 @@
           m_pcEntropyCoder->resetEntropy      ();
           /* start slice NALunit */
-#if H_MV
-          OutputNALUnit nalu( pcSlice->getNalUnitType(), pcSlice->getTLayer(), getLayerId() );
-#else
           OutputNALUnit nalu( pcSlice->getNalUnitType(), pcSlice->getTLayer() );
-#endif
           Bool sliceSegment = (!pcSlice->isNextSlice());
           if (!sliceSegment)
@@ -1707,10 +1610,5 @@
       }
 
-#if !H_3D
       pcPic->compressMotion(); 
-#endif
-#if H_MV
-      m_pocLastCoded = pcPic->getPOC();
-#endif
       //-- For time output for each slice
       Double dEncTime = (Double)(clock()-iBeforeTime) / CLOCKS_PER_SEC;
@@ -2023,9 +1921,4 @@
 
       pcPic->setReconMark   ( true );
-#if H_MV
-      TComSlice::markIvRefPicsAsShortTerm( m_refPicSetInterLayer );  
-      std::vector<Int> temp; 
-      TComSlice::markIvRefPicsAsUnused   ( m_ivPicLists, temp, pcPic->getSlice(0)->getVPS(), m_layerId, pcPic->getPOC() ); 
-#endif
       m_bFirst = false;
       m_iNumPicCoded++;
@@ -2048,10 +1941,7 @@
   if( accumNalsDU != NULL) delete accumNalsDU;
 
-#if !H_MV
   assert ( m_iNumPicCoded == iNumPicRcvd );
-#endif
 }
 
-#if !H_MV
 Void TEncGOP::printOutSummary(UInt uiNumAllPicCoded)
 {
@@ -2089,5 +1979,4 @@
   printf("\nRVM: %.3lf\n" , xCalculateRVM());
 }
-#endif
 
 Void TEncGOP::preLoopFilterPicAll( TComPic* pcPic, UInt64& ruiDist, UInt64& ruiBits )
@@ -2365,33 +2254,17 @@
 
   //===== add PSNR =====
-#if H_MV
-  m_pcEncTop->getAnalyzeAll()->addResult (dYPSNR, dUPSNR, dVPSNR, (Double)uibits);
-#else
   m_gcAnalyzeAll.addResult (dYPSNR, dUPSNR, dVPSNR, (Double)uibits);
-#endif
   TComSlice*  pcSlice = pcPic->getSlice(0);
   if (pcSlice->isIntra())
   {
-#if H_MV
-    m_pcEncTop->getAnalyzeI()->addResult (dYPSNR, dUPSNR, dVPSNR, (Double)uibits);
-#else
     m_gcAnalyzeI.addResult (dYPSNR, dUPSNR, dVPSNR, (Double)uibits);
-#endif
   }
   if (pcSlice->isInterP())
   {
-#if H_MV
-    m_pcEncTop->getAnalyzeP()->addResult (dYPSNR, dUPSNR, dVPSNR, (Double)uibits);
-#else
     m_gcAnalyzeP.addResult (dYPSNR, dUPSNR, dVPSNR, (Double)uibits);
-#endif
   }
   if (pcSlice->isInterB())
   {
-#if H_MV
-    m_pcEncTop->getAnalyzeB()->addResult (dYPSNR, dUPSNR, dVPSNR, (Double)uibits);
-#else
     m_gcAnalyzeB.addResult (dYPSNR, dUPSNR, dVPSNR, (Double)uibits);
-#endif
   }
 
@@ -2400,14 +2273,4 @@
 
 #if ADAPTIVE_QP_SELECTION
-#if H_MV
-  printf("Layer %3d   POC %4d TId: %1d ( %c-SLICE, nQP %d QP %d ) %10d bits",
-    pcSlice->getLayerId(),
-    pcSlice->getPOC(),
-    pcSlice->getTLayer(),
-    c,
-    pcSlice->getSliceQpBase(),
-    pcSlice->getSliceQp(),
-    uibits );
-#else
   printf("POC %4d TId: %1d ( %c-SLICE, nQP %d QP %d ) %10d bits",
          pcSlice->getPOC(),
@@ -2417,14 +2280,4 @@
          pcSlice->getSliceQp(),
          uibits );
-#endif
-#else
-#if H_MV
-  printf("Layer %3d   POC %4d TId: %1d ( %c-SLICE, QP %d ) %10d bits",
-    pcSlice->getLayerId(),
-    pcSlice->getPOC()-pcSlice->getLastIDR(),
-    pcSlice->getTLayer(),
-    c,
-    pcSlice->getSliceQp(),
-    uibits );
 #else
   printf("POC %4d TId: %1d ( %c-SLICE, QP %d ) %10d bits",
@@ -2434,5 +2287,4 @@
          pcSlice->getSliceQp(),
          uibits );
-#endif
 
 #endif
@@ -2445,16 +2297,5 @@
     for (Int iRefIndex = 0; iRefIndex < pcSlice->getNumRefIdx(RefPicList(iRefList)); iRefIndex++)
     {
-#if H_MV
-      if( pcSlice->getLayerId() != pcSlice->getRefLayerId( RefPicList(iRefList), iRefIndex ) )
-      {
-        printf( "V%d ", pcSlice->getRefLayerId( RefPicList(iRefList), iRefIndex ) );
-      }
-      else
-      {
-#endif
       printf ("%d ", pcSlice->getRefPOC(RefPicList(iRefList), iRefIndex)-pcSlice->getLastIDR());
-#if H_MV
-      }
-#endif
     }
     printf("]");
@@ -2822,82 +2663,3 @@
 }
 #endif
-#if H_MV
-Void TEncGOP::xSetRefPicListModificationsMvc( TComSlice* pcSlice, UInt uiPOCCurr, UInt iGOPid )
-{ 
-  TComVPS* vps = pcSlice->getVPS(); 
-  Int layer    = pcSlice->getLayerIdInVps( ); 
-  
-  if( pcSlice->getSliceType() == I_SLICE || !(pcSlice->getPPS()->getListsModificationPresentFlag()) || vps->getNumDirectRefLayers( layer ) == 0 )
-  {
-    return;
-  }
-
-  // analyze inter-view modifications
-  GOPEntry ge = m_pcCfg->getGOPEntry( (pcSlice->getRapPicFlag() && ( layer > 0) ) ? MAX_GOP : iGOPid );
-
-  TComRefPicListModification* refPicListModification = pcSlice->getRefPicListModification();
-  
-  Int maxRefListSize  = pcSlice->getNumRpsCurrTempList();
-  Int numTemporalRefs = maxRefListSize - vps->getNumDirectRefLayers( layer );
-
-
-  for (Int li = 0; li < 2; li ++) // Loop over lists L0 and L1
-  {
-    Int numModifications = 0;
-    
-    for( Int k = 0; k < ge.m_numInterViewRefPics; k++ ) 
-    {
-      numModifications +=  ( ge.m_interViewRefPosL[li][k] >= 0 ) ? 1 : 0; 
-    }
-
-    // set inter-view modifications
-    if( (maxRefListSize > 1) && (numModifications > 0) )
-    {
-      refPicListModification->setRefPicListModificationFlagL( li, true );
-      Int tempList[16];
-      for( Int k = 0; k < 16; k++ ) { tempList[k] = -1; }
-
-      Bool isModified = false;
-      for( Int k = 0; k < ge.m_numInterViewRefPics; k++ )
-      {
-        if( ge.m_interViewRefPosL[li][k] >= 0 )
-        {
-          Int orgIdx    = numTemporalRefs;
-          Int targetIdx = ge.m_interViewRefPosL[ li ][ k ];
-          for( Int idx = 0; idx < vps->getNumDirectRefLayers( layer ); idx++ )
-          {            
-            Int refLayer  = vps->getLayerIdInVps( vps->getRefLayerId( layer, idx ) );          
-            if( ( layer + ge.m_interViewRefs[ k ]) == refLayer )
-            {
-              tempList[ targetIdx ] = orgIdx;              
-              isModified = ( targetIdx != orgIdx  );
-            }
-            orgIdx++;
-          }
-        }
-      }
-      if( isModified )
-      {
-        Int temporalRefIdx = 0;
-        for( Int i = 0; i < pcSlice->getNumRefIdx( ( li == 0 ) ? REF_PIC_LIST_0 : REF_PIC_LIST_1 ); i++ )
-        {
-          if( tempList[i] >= 0 ) 
-          {
-            refPicListModification->setRefPicSetIdxL( li, i, tempList[i] );
-          }
-          else
-          {
-            refPicListModification->setRefPicSetIdxL( li, i, temporalRefIdx );
-            temporalRefIdx++;
-          }
-        }
-      }
-      else
-      {
-        refPicListModification->setRefPicListModificationFlagL( li, false );
-      }
-    }
-  }
-}
-#endif
 //! \}
Index: branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncGOP.h
===================================================================
--- branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncGOP.h	(revision 366)
+++ branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncGOP.h	(revision 367)
@@ -97,15 +97,4 @@
   SEIWriter               m_seiWriter;
   
-#if H_MV
-  TComPicLists*           m_ivPicLists;
-  std::vector<TComPic*>   m_refPicSetInterLayer; 
-
-  Int                     m_pocLastCoded;
-  Int                     m_layerId;  
-  Int                     m_viewId;
-#if H_3D
-  Bool                    m_isDepth;
-#endif
-#endif
   //--Adaptive Loop filter
   TEncSampleAdaptiveOffset*  m_pcSAO;
@@ -144,20 +133,7 @@
   
   Void  init        ( TEncTop* pcTEncTop );
-#if H_MV
-  Void  initGOP     ( Int iPOCLast, Int iNumPicRcvd, TComList<TComPic*>& rcListPic, TComList<TComPicYuv*>& rcListPicYuvRecOut, std::list<AccessUnit>& accessUnitsInGOP);
-  Void  compressPicInGOP ( Int iPOCLast, Int iNumPicRcvd, TComList<TComPic*>& rcListPic, TComList<TComPicYuv*>& rcListPicYuvRecOut, std::list<AccessUnit>& accessUnitsInGOP, Int iGOPid );
-#else
   Void  compressGOP( Int iPOCLast, Int iNumPicRcvd, TComList<TComPic*>& rcListPic, TComList<TComPicYuv*>& rcListPicYuvRec, std::list<AccessUnit>& accessUnitsInGOP );
-#endif
   Void  xAttachSliceDataToNalUnit (OutputNALUnit& rNalu, TComOutputBitstream*& rpcBitstreamRedirect);
 
-#if H_MV
-  Int       getPocLastCoded  ()                 { return m_pocLastCoded; }  
-  Int       getLayerId       ()                 { return m_layerId;    }  
-  Int       getViewId        ()                 { return m_viewId;    }
-#if H_3D
-  Bool      getIsDepth       ()                 { return m_isDepth; }
-#endif
-#endif
 
   Int   getGOPSize()          { return  m_iGopSize;  }
@@ -165,7 +141,5 @@
   TComList<TComPic*>*   getListPic()      { return m_pcListPic; }
   
-#if !H_MV
   Void  printOutSummary      ( UInt uiNumAllPicCoded );
-#endif
   Void  preLoopFilterPicAll  ( TComPic* pcPic, UInt64& ruiDist, UInt64& ruiBits );
   
@@ -211,7 +185,4 @@
 #endif
 #endif
-#if H_MV
-   Void  xSetRefPicListModificationsMvc( TComSlice* pcSlice, UInt uiPOCCurr, UInt iGOPid );
-#endif
 #if L0386_DB_METRIC
   Void dblMetric( TComPic* pcPic, UInt uiNumSlices );
Index: branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncSlice.cpp
===================================================================
--- branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncSlice.cpp	(revision 366)
+++ branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncSlice.cpp	(revision 367)
@@ -219,20 +219,4 @@
   
   // slice type
-#if H_MV
-  SliceType eSliceTypeBaseView;
-  if( pocLast == 0 || pocCurr % m_pcCfg->getIntraPeriod() == 0 || m_pcGOPEncoder->getGOPSize() == 0 )
-  {
-    eSliceTypeBaseView = I_SLICE;
-  }
-  else
-  {
-    eSliceTypeBaseView = B_SLICE;
-  }
-  SliceType eSliceType = eSliceTypeBaseView;
-  if( eSliceTypeBaseView == I_SLICE && m_pcCfg->getGOPEntry(MAX_GOP).m_POC == 0 && m_pcCfg->getGOPEntry(MAX_GOP).m_sliceType != 'I' )
-  {
-    eSliceType = B_SLICE; 
-  }
-#else
   SliceType eSliceType;
   
@@ -241,5 +225,4 @@
   
   rpcSlice->setSliceType    ( eSliceType );
-#endif
 
   // ------------------------------------------------------------------------------------------------------------------
@@ -270,9 +253,5 @@
     if (!(( m_pcCfg->getMaxDeltaQP() == 0 ) && (dQP == -rpcSlice->getSPS()->getQpBDOffsetY() ) && (rpcSlice->getSPS()->getUseLossless()))) 
     {
-#if H_MV
-      dQP += m_pcCfg->getGOPEntry( (eSliceTypeBaseView == I_SLICE) ? MAX_GOP : iGOPid ).m_QPOffset;
-#else
       dQP += m_pcCfg->getGOPEntry(iGOPid).m_QPOffset;
-#endif
     }
   }
@@ -317,15 +296,6 @@
 #endif
     // Case #1: I or P-slices (key-frame)
-#if H_MV
-    Double dQPFactor;
-    if( eSliceType != I_SLICE ) 
-    {
-      dQPFactor = m_pcCfg->getGOPEntry( (eSliceTypeBaseView == I_SLICE) ? MAX_GOP : iGOPid ).m_QPFactor;
-    }
-    else
-#else
     Double dQPFactor = m_pcCfg->getGOPEntry(iGOPid).m_QPFactor;
     if ( eSliceType==I_SLICE )
-#endif
     {
       dQPFactor=0.57*dLambda_scale;
@@ -362,9 +332,5 @@
   if( rpcSlice->getSliceType( ) != I_SLICE )
   {
-#if H_MV
-    dLambda *= m_pcCfg->getLambdaModifier( m_pcCfg->getGOPEntry((eSliceTypeBaseView == I_SLICE) ? MAX_GOP : iGOPid).m_temporalId );
-#else
     dLambda *= m_pcCfg->getLambdaModifier( m_pcCfg->getGOPEntry(iGOPid).m_temporalId );
-#endif
   }
 
@@ -405,13 +371,5 @@
 #if HB_LAMBDA_FOR_LDC
   // restore original slice type
-#if H_MV
-  eSliceType = eSliceTypeBaseView;
-  if( eSliceTypeBaseView == I_SLICE && m_pcCfg->getGOPEntry(MAX_GOP).m_POC == 0 && m_pcCfg->getGOPEntry(MAX_GOP).m_sliceType != 'I' )
-  {
-    eSliceType = B_SLICE;
-  }
-#else
   eSliceType = (pocLast == 0 || pocCurr % m_pcCfg->getIntraPeriod() == 0 || m_pcGOPEncoder->getGOPSize() == 0) ? I_SLICE : eSliceType;
-#endif
 
   rpcSlice->setSliceType        ( eSliceType );
@@ -431,11 +389,6 @@
   rpcSlice->setSliceQpDeltaCb   ( 0 );
   rpcSlice->setSliceQpDeltaCr   ( 0 );
-#if H_MV
-  rpcSlice->setNumRefIdx(REF_PIC_LIST_0,m_pcCfg->getGOPEntry( (eSliceTypeBaseView == I_SLICE) ? MAX_GOP : iGOPid ).m_numRefPicsActive);
-  rpcSlice->setNumRefIdx(REF_PIC_LIST_1,m_pcCfg->getGOPEntry( (eSliceTypeBaseView == I_SLICE) ? MAX_GOP : iGOPid ).m_numRefPicsActive);
-#else
   rpcSlice->setNumRefIdx(REF_PIC_LIST_0,m_pcCfg->getGOPEntry(iGOPid).m_numRefPicsActive);
   rpcSlice->setNumRefIdx(REF_PIC_LIST_1,m_pcCfg->getGOPEntry(iGOPid).m_numRefPicsActive);
-#endif
 
 #if L0386_DB_METRIC
@@ -458,15 +411,8 @@
       if ( !m_pcCfg->getLoopFilterOffsetInPPS() && eSliceType!=I_SLICE)
       {
-#if H_MV
-        rpcSlice->getPPS()->setDeblockingFilterBetaOffsetDiv2( m_pcCfg->getGOPEntry((eSliceTypeBaseView == I_SLICE) ? MAX_GOP : iGOPid).m_betaOffsetDiv2 + m_pcCfg->getLoopFilterBetaOffset() );
-        rpcSlice->getPPS()->setDeblockingFilterTcOffsetDiv2( m_pcCfg->getGOPEntry((eSliceTypeBaseView == I_SLICE) ? MAX_GOP : iGOPid).m_tcOffsetDiv2 + m_pcCfg->getLoopFilterTcOffset() );
-        rpcSlice->setDeblockingFilterBetaOffsetDiv2( m_pcCfg->getGOPEntry((eSliceTypeBaseView == I_SLICE) ? MAX_GOP : iGOPid).m_betaOffsetDiv2 + m_pcCfg->getLoopFilterBetaOffset()  );
-        rpcSlice->setDeblockingFilterTcOffsetDiv2( m_pcCfg->getGOPEntry((eSliceTypeBaseView == I_SLICE) ? MAX_GOP : iGOPid).m_tcOffsetDiv2 + m_pcCfg->getLoopFilterTcOffset() );
-#else
         rpcSlice->getPPS()->setDeblockingFilterBetaOffsetDiv2( m_pcCfg->getGOPEntry(iGOPid).m_betaOffsetDiv2 + m_pcCfg->getLoopFilterBetaOffset() );
         rpcSlice->getPPS()->setDeblockingFilterTcOffsetDiv2( m_pcCfg->getGOPEntry(iGOPid).m_tcOffsetDiv2 + m_pcCfg->getLoopFilterTcOffset() );
         rpcSlice->setDeblockingFilterBetaOffsetDiv2( m_pcCfg->getGOPEntry(iGOPid).m_betaOffsetDiv2 + m_pcCfg->getLoopFilterBetaOffset()  );
         rpcSlice->setDeblockingFilterTcOffsetDiv2( m_pcCfg->getGOPEntry(iGOPid).m_tcOffsetDiv2 + m_pcCfg->getLoopFilterTcOffset() );
-#endif
       }
       else
@@ -489,9 +435,5 @@
   rpcSlice->setDepth            ( depth );
   
-#if H_MV
-  pcPic->setTLayer( m_pcCfg->getGOPEntry( (eSliceTypeBaseView == I_SLICE) ? MAX_GOP : iGOPid ).m_temporalId );
-#else
   pcPic->setTLayer( m_pcCfg->getGOPEntry(iGOPid).m_temporalId );
-#endif
   if(eSliceType==I_SLICE)
   {
Index: branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncTop.cpp
===================================================================
--- branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncTop.cpp	(revision 366)
+++ branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncTop.cpp	(revision 367)
@@ -42,7 +42,4 @@
 #include "TLibCommon/ContextModel.h"
 #endif
-#if H_MV
-#include "../../App/TAppEncoder/TAppEncTop.h"
-#endif
 
 //! \ingroup TLibEncoder
@@ -81,7 +78,4 @@
   m_pcBitCounters          = NULL;
   m_pcRdCosts              = NULL;
-#if H_MV
-  m_ivPicLists = NULL;
-#endif
 }
 
@@ -95,8 +89,6 @@
 Void TEncTop::create ()
 {
-#if !H_MV
   // initialize global variables
   initROM();
-#endif
   
   // create processing unit classes
@@ -276,8 +268,6 @@
   delete[] m_pcRdCosts;
   
-#if !H_MV
     // destroy ROM
   destroyROM();
-#endif
 
   return;
@@ -329,20 +319,4 @@
 // ====================================================================================================================
 
-#if H_MV
-Void TEncTop::initNewPic( TComPicYuv* pcPicYuvOrg )
-{
-  TComPic* pcPicCurr = NULL;
-
-  // get original YUV
-  xGetNewPicBuffer( pcPicCurr );
-  pcPicYuvOrg->copyToPic( pcPicCurr->getPicYuvOrg() );
-
-  // compute image characteristics
-  if ( getUseAdaptiveQP() )
-  {
-    m_cPreanalyzer.xPreanalyze( dynamic_cast<TEncPic*>( pcPicCurr ) );
-  }
-}
-#endif
 Void TEncTop::deletePicBuffer()
 {
@@ -371,23 +345,6 @@
  \retval  iNumEncoded         number of encoded pictures
  */
-#if H_MV
-Void TEncTop::encode(Bool flush, TComPicYuv* pcPicYuvOrg, TComList<TComPicYuv*>& rcListPicYuvRecOut, std::list<AccessUnit>& accessUnitsOut, Int& iNumEncoded , Int gopId )
-{
-#else
 Void TEncTop::encode(Bool flush, TComPicYuv* pcPicYuvOrg, TComList<TComPicYuv*>& rcListPicYuvRecOut, std::list<AccessUnit>& accessUnitsOut, Int& iNumEncoded )
 {
-#endif
-#if H_3D
-  TComPic* picLastCoded = getPic( getGOPEncoder()->getPocLastCoded() );
-  if( picLastCoded )
-  {
-    picLastCoded->compressMotion(); 
-  }
-#endif
-#if H_MV
-  if( gopId == 0)
-  {
-    m_cGOPEncoder.initGOP(m_iPOCLast, m_iNumPicRcvd, m_cListPic, rcListPicYuvRecOut, accessUnitsOut);  
-#else
   if (pcPicYuvOrg) {
     // get original YUV
@@ -408,5 +365,4 @@
     return;
   }
-#endif
   
 #if RATE_CONTROL_LAMBDA_DOMAIN
@@ -417,14 +373,6 @@
 #endif
 
-#if H_MV
-  }
-  m_cGOPEncoder.compressPicInGOP(m_iPOCLast, m_iNumPicRcvd, m_cListPic, rcListPicYuvRecOut, accessUnitsOut, gopId );
-
-  if( gopId + 1 == m_cGOPEncoder.getGOPSize() )
-  {
-#else
   // compress GOP
   m_cGOPEncoder.compressGOP(m_iPOCLast, m_iNumPicRcvd, m_cListPic, rcListPicYuvRecOut, accessUnitsOut);
-#endif
 
 #if RATE_CONTROL_LAMBDA_DOMAIN
@@ -438,7 +386,4 @@
   m_iNumPicRcvd       = 0;
   m_uiNumAllPicCoded += iNumEncoded;
-#if H_MV
-}
-#endif
 }
 
@@ -505,7 +450,4 @@
 Void TEncTop::xInitSPS()
 {
-#if H_MV
-  m_cSPS.setSPSId( getLayerIdInVps() );
-#endif
   ProfileTierLevel& profileTierLevel = *m_cSPS.getPTL()->getGeneralPTL();
   profileTierLevel.setLevelIdc(m_level);
@@ -652,12 +594,4 @@
 Void TEncTop::xInitPPS()
 {
-#if H_MV
-  if( m_cVPS.getNumDirectRefLayers( getLayerIdInVps() ) > 0 )
-  {
-    m_cPPS.setListsModificationPresentFlag( true );
-  }
-  m_cPPS.setPPSId( getLayerIdInVps() );
-  m_cPPS.setSPSId( getLayerIdInVps() );
-#endif
   m_cPPS.setConstrainedIntraPred( m_bUseConstrainedIntraPred );
   Bool bUseDQP = (getMaxCuDQPDepth() > 0)? true : false;
@@ -963,17 +897,4 @@
 Void TEncTop::selectReferencePictureSet(TComSlice* slice, Int POCCurr, Int GOPid )
 {
-#if H_MV
-  if( slice->getRapPicFlag() == true && getLayerId() > 0 && POCCurr == 0 )
-  {
-    TComReferencePictureSet* rps = slice->getLocalRPS();
-    rps->setNumberOfNegativePictures(0);
-    rps->setNumberOfPositivePictures(0);
-    rps->setNumberOfLongtermPictures(0);
-    rps->setNumberOfPictures(0);
-    slice->setRPS(rps);
-  }
-  else
-  {
-#endif
   slice->setRPSidx(GOPid);
 
@@ -1003,7 +924,4 @@
   slice->setRPS(getSPS()->getRPSList()->getReferencePictureSet(slice->getRPSidx()));
   slice->getRPS()->setNumberOfPictures(slice->getRPS()->getNumberOfNegativePictures()+slice->getRPS()->getNumberOfPositivePictures());
-#if H_MV
-  }
-#endif
 
 }
@@ -1120,65 +1038,3 @@
   }
 }
-#if H_MV
-Void TEncTop::printSummary( Int numAllPicCoded )
-{
-  assert (numAllPicCoded == m_cAnalyzeAll.getNumPic());
-
-  //--CFG_KDY
-  m_cAnalyzeAll.setFrmRate( getFrameRate() );
-  m_cAnalyzeI.setFrmRate( getFrameRate() );
-  m_cAnalyzeP.setFrmRate( getFrameRate() );
-  m_cAnalyzeB.setFrmRate( getFrameRate() );
-
-  //-- all
-  printf( "\n\nSUMMARY ------------------------------------------- LayerId %2d\n", m_layerId );
-
-  m_cAnalyzeAll.printOut('a');
-
-  printf( "\n\nI Slices--------------------------------------------------------\n" );
-  m_cAnalyzeI.printOut('i');
-
-  printf( "\n\nP Slices--------------------------------------------------------\n" );
-  m_cAnalyzeP.printOut('p');
-
-  printf( "\n\nB Slices--------------------------------------------------------\n" );
-  m_cAnalyzeB.printOut('b');
-
-#if _SUMMARY_OUT_
-  m_cAnalyzeAll.printSummaryOut();
-#endif
-#if _SUMMARY_PIC_
-  m_cAnalyzeI.printSummary('I');
-  m_cAnalyzeP.printSummary('P');
-  m_cAnalyzeB.printSummary('B');
-#endif
-}
-
-Int TEncTop::getFrameId(Int iGOPid)  
-{
-  if(m_iPOCLast == 0)
-  {
-    return(0 );
-  }
-  else
-  {
-    return m_iPOCLast -m_iNumPicRcvd+ getGOPEntry(iGOPid).m_POC ;
-  }
-}
-
-TComPic* TEncTop::getPic( Int poc )
-{
-  TComList<TComPic*>* listPic = getListPic();
-  TComPic* pcPic = NULL;
-  for(TComList<TComPic*>::iterator it=listPic->begin(); it!=listPic->end(); it++)
-  {
-    if( (*it)->getPOC() == poc )
-    {
-      pcPic = *it ;
-      break ;
-    }
-  }
-  return pcPic;
-}
-#endif
 //! \}
Index: branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncTop.h
===================================================================
--- branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncTop.h	(revision 366)
+++ branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncTop.h	(revision 367)
@@ -74,7 +74,4 @@
   TComList<TComPic*>      m_cListPic;                     ///< dynamic list of pictures
   
-#if H_MV
-  TComPicLists*           m_ivPicLists;                   ///< access to picture lists of other layers 
-#endif
   // encoder search
   TEncSearch              m_cSearch;                      ///< encoder search class
@@ -125,10 +122,4 @@
   TEncRateCtrl            m_cRateCtrl;                    ///< Rate control class
   
-#if H_MV
-  TEncAnalyze             m_cAnalyzeAll;
-  TEncAnalyze             m_cAnalyzeI;
-  TEncAnalyze             m_cAnalyzeP;
-  TEncAnalyze             m_cAnalyzeB;  
-#endif
 protected:
   Void  xGetNewPicBuffer  ( TComPic*& rpcPic );           ///< get picture buffer which will be processed
@@ -146,14 +137,8 @@
   Void      destroy         ();
   Void      init            ();
-#if H_MV  
-  TComPicLists* getIvPicLists() { return m_ivPicLists; }
-#endif
   Void      deletePicBuffer ();
 
   Void      createWPPCoders(Int iNumSubstreams);
   
-#if H_MV
-  Void      initNewPic(TComPicYuv* pcPicYuvOrg);
-#endif
   // -------------------------------------------------------------------------------------------------------------------
   // member access functions
@@ -192,17 +177,4 @@
 #endif
   TComScalingList*        getScalingList        () { return  &m_scalingList;         }
-#if H_MV
-  TEncAnalyze*            getAnalyzeAll         () { return &m_cAnalyzeAll; }
-  TEncAnalyze*            getAnalyzeI           () { return &m_cAnalyzeI;   }
-  TEncAnalyze*            getAnalyzeP           () { return &m_cAnalyzeP;   }
-  TEncAnalyze*            getAnalyzeB           () { return &m_cAnalyzeB;   }
-
-  Int                     getNumAllPicCoded     () { return m_uiNumAllPicCoded; }
- 
-  Int                     getFrameId            (Int iGOPid);
-  
-  TComPic*                getPic                ( Int poc );
-  Void                    setIvPicLists         ( TComPicLists* picLists) { m_ivPicLists = picLists; }
-#endif
   // -------------------------------------------------------------------------------------------------------------------
   // encoder function
@@ -210,16 +182,8 @@
 
   /// encode several number of pictures until end-of-sequence
-#if H_MV
-  Void encode( Bool bEos, TComPicYuv* pcPicYuvOrg, TComList<TComPicYuv*>& rcListPicYuvRecOut, std::list<AccessUnit>& accessUnitsOut, Int& iNumEncoded  , Int gopId  );  
-#else
   Void encode( Bool bEos, TComPicYuv* pcPicYuvOrg, TComList<TComPicYuv*>& rcListPicYuvRecOut,
               std::list<AccessUnit>& accessUnitsOut, Int& iNumEncoded );  
-#endif
 
-#if H_MV
-  Void printSummary      ( Int numAllPicCoded ); 
-#else
   void printSummary() { m_cGOPEncoder.printOutSummary (m_uiNumAllPicCoded); }
-#endif
 };
 
