Index: branches/HTM-DEV-0.3-dev2/source/App/TAppDecoder/TAppDecTop.cpp
===================================================================
--- branches/HTM-DEV-0.3-dev2/source/App/TAppDecoder/TAppDecTop.cpp	(revision 476)
+++ branches/HTM-DEV-0.3-dev2/source/App/TAppDecoder/TAppDecTop.cpp	(revision 478)
@@ -683,4 +683,5 @@
 #endif
 #if H_3D_IV_MERGE
+// GT: This function is not necessary anymore m_ivPicLists should be used instead
 TComPic* TAppDecTop::xGetPicFromView( Int viewIdx, Int poc, Bool isDepth )
 {
@@ -701,4 +702,3 @@
 }
 #endif
-
 //! \}
Index: branches/HTM-DEV-0.3-dev2/source/App/TAppDecoder/TAppDecTop.h
===================================================================
--- branches/HTM-DEV-0.3-dev2/source/App/TAppDecoder/TAppDecTop.h	(revision 476)
+++ branches/HTM-DEV-0.3-dev2/source/App/TAppDecoder/TAppDecTop.h	(revision 478)
@@ -76,5 +76,4 @@
     // for output control
   Bool                            m_abDecFlag[ MAX_GOP ];         ///< decoded flag in one GOP
-
 #if H_3D_IV_MERGE
   Int  m_fcoViewDepthId;
@@ -107,7 +106,4 @@
   TDecTop* getTDecTop     ( Int viewIdx, Bool isDepth );
   TComPic*              getPicFromView     ( Int viewIdx, Int poc, bool isDepth ) { return xGetPicFromView( viewIdx, poc, isDepth ); }
-#endif
-
-#if H_3D_IV_MERGE
   TComVPSAccess*    getVPSAccess  () { return &m_cVPSAccess;   }
   TComSPSAccess*    getSPSAccess  () { return &m_cSPSAccess;   }
@@ -124,5 +120,4 @@
   TComPic* xGetPicFromView( Int viewIdx, Int poc, Bool isDepth );
 #endif
-
 #if H_MV
   Void  xWriteOutput      ( TComList<TComPic*>* pcListPic, Int layerId, Int tId ); ///< write YUV to file
@@ -133,5 +128,4 @@
   Void  xFlushOutput      ( TComList<TComPic*>* pcListPic ); ///< flush all remaining decoded pictures to file
 #endif
-
   Bool  isNaluWithinTargetDecLayerIdSet ( InputNALUnit* nalu ); ///< check whether given Nalu is within targetDecLayerIdSet
 };
Index: branches/HTM-DEV-0.3-dev2/source/App/TAppEncoder/TAppEncCfg.cpp
===================================================================
--- branches/HTM-DEV-0.3-dev2/source/App/TAppEncoder/TAppEncCfg.cpp	(revision 476)
+++ branches/HTM-DEV-0.3-dev2/source/App/TAppEncoder/TAppEncCfg.cpp	(revision 478)
@@ -717,5 +717,4 @@
 
 #endif //HHI_VSO
-
 #if H_3D_IV_MERGE
   ("PredDepthMapGen",  m_uiPredDepthMapGeneration, (UInt)0, "generation of prediction depth maps for motion data prediction" )
Index: branches/HTM-DEV-0.3-dev2/source/App/TAppEncoder/TAppEncTop.cpp
===================================================================
--- branches/HTM-DEV-0.3-dev2/source/App/TAppEncoder/TAppEncTop.cpp	(revision 476)
+++ branches/HTM-DEV-0.3-dev2/source/App/TAppEncoder/TAppEncTop.cpp	(revision 478)
@@ -128,29 +128,8 @@
     m_frameRcvd                 .push_back(0);
     m_acTEncTopList             .push_back(new TEncTop); 
-#if H_3D_IV_MERGE
-//    m_acTEncDepthTopList        .push_back(new TEncTop); 
-#endif
     m_acTVideoIOYuvInputFileList.push_back(new TVideoIOYuv);
     m_acTVideoIOYuvReconFileList.push_back(new TVideoIOYuv);
     m_picYuvRec                 .push_back(new TComList<TComPicYuv*>) ;
-#if H_3D_IV_MERGE
-    //m_acTEncDepthTopList[iViewIdx]->setFrameRate                    ( m_iFrameRate );
-    //m_acTEncDepthTopList[iViewIdx]->setFrameSkip                    ( m_FrameSkip );
-    //m_acTEncDepthTopList[iViewIdx]->setSourceWidth                  ( m_iSourceWidth );
-    //m_acTEncDepthTopList[iViewIdx]->setSourceHeight                 ( m_iSourceHeight );
-    //m_acTEncDepthTopList[iViewIdx]->setCroppingMode                 ( m_croppingMode );
-    //m_acTEncDepthTopList[iViewIdx]->setCropLeft                     ( m_cropLeft );
-    //m_acTEncDepthTopList[iViewIdx]->setCropRight                    ( m_cropRight );
-    //m_acTEncDepthTopList[iViewIdx]->setCropTop                      ( m_cropTop );
-    //m_acTEncDepthTopList[iViewIdx]->setCropBottom                   ( m_cropBottom );
-    //m_acTEncDepthTopList[iViewIdx]->setFrameToBeEncoded             ( m_iFrameToBeEncoded );
-    //m_acTEncDepthTopList[iViewIdx]->setViewId                       ( iViewIdx );
-    //m_acTEncDepthTopList[iViewIdx]->setIsDepth                      ( true );
-
-    //m_acTEncDepthTopList[iViewIdx]->setViewOrderIdx                 ( m_cCameraData.getViewOrderIndex()[ iViewIdx ] );
-
-    //m_acTEncDepthTopList[iViewIdx]->setLayerId                      ( layerId );
-
-#endif
+
     m_ivPicLists.push_back( m_acTEncTopList[ layer ]->getListPic()  ); 
     TEncTop& m_cTEncTop = *m_acTEncTopList[ layer ];  // It is not a member, but this name helps avoiding code duplication !!!
@@ -164,10 +143,4 @@
     m_cTEncTop.setIsDepth                      ( isDepth );
     //====== Camera Parameters =========
-#if H_3D_IV_MERGE
-      //m_acTEncDepthTopList[iViewIdx]->setCamParPrecision              ( 0 );
-      //m_acTEncDepthTopList[iViewIdx]->setCamParInSliceHeader          ( false );
-      //m_acTEncDepthTopList[iViewIdx]->setCodedScale                   ( 0 );
-      //m_acTEncDepthTopList[iViewIdx]->setCodedOffset                  ( 0 );
-#endif
     m_cTEncTop.setCameraParameters             ( &m_cCameraData );     
     m_cTEncTop.setCamParPrecision              ( isDepth ? false : m_cCameraData.getCamParsCodedPrecision  () );
@@ -220,11 +193,4 @@
   
   //====== Coding Structure ========
-#if H_3D_IV_MERGE
-      //m_acTEncDepthTopList[iViewIdx]->setIntraPeriod                  ( m_iIntraPeriod );
-      //m_acTEncDepthTopList[iViewIdx]->setDecodingRefreshType          ( m_iDecodingRefreshType );
-      //m_acTEncDepthTopList[iViewIdx]->setGOPSize                      ( m_iGOPSize );
-      //m_acTEncDepthTopList[iViewIdx]->setGopList                      ( m_GOPListsMvc[iViewIdx] );
-      //m_acTEncDepthTopList[iViewIdx]->setExtraRPSs                    ( m_extraRPSs[iViewIdx] );
-#endif
   m_cTEncTop.setIntraPeriod                  ( m_iIntraPeriod );
   m_cTEncTop.setDecodingRefreshType          ( m_iDecodingRefreshType );
@@ -267,7 +233,4 @@
   {
     m_cTEncTop.setLambdaModifier( uiLoop, m_adLambdaModifier[ uiLoop ] );
-#if H_3D_IV_MERGE
-//        m_acTEncDepthTopList[iViewIdx]->setLambdaModifier( uiLoop, m_adLambdaModifier[ uiLoop ] );
-#endif
   }
 #if H_MV
@@ -289,11 +252,4 @@
   
   //====== Loop/Deblock Filter ========
-#if H_3D_IV_MERGE
-      //m_acTEncDepthTopList[iViewIdx]->setLoopFilterDisable            ( m_abLoopFilterDisable[1]   );
-      //m_acTEncDepthTopList[iViewIdx]->setLoopFilterOffsetInAPS        ( m_loopFilterOffsetInAPS );
-      //m_acTEncDepthTopList[iViewIdx]->setLoopFilterBetaOffset         ( m_loopFilterBetaOffsetDiv2  );
-      //m_acTEncDepthTopList[iViewIdx]->setLoopFilterTcOffset           ( m_loopFilterTcOffsetDiv2    );
-      //m_acTEncDepthTopList[iViewIdx]->setDeblockingFilterControlPresent( m_DeblockingFilterControlPresent);
-#endif
 #if H_MV
   m_cTEncTop.setLoopFilterDisable            ( m_bLoopFilterDisable[layer]);
@@ -1102,4 +1058,5 @@
 #endif
 #if H_3D_IV_MERGE
+ // GT: This function is not necessary anymore m_ivPicLists should be used instead
 TComPic* TAppEncTop::xGetPicFromView( Int viewIdx, Int poc, Bool isDepth )
 {
Index: branches/HTM-DEV-0.3-dev2/source/App/TAppEncoder/TAppEncTop.h
===================================================================
--- branches/HTM-DEV-0.3-dev2/source/App/TAppEncoder/TAppEncTop.h	(revision 476)
+++ branches/HTM-DEV-0.3-dev2/source/App/TAppEncoder/TAppEncTop.h	(revision 478)
@@ -92,5 +92,4 @@
   TRenModel                   m_cRendererModel;   
 #endif
-
 #if H_3D_IV_MERGE
   TComVPSAccess               m_cVPSAccess;
@@ -145,5 +144,4 @@
   TEncTop&    getTEncTop  ()   { return  m_cTEncTop; }      ///< return encoder class pointer reference
 #endif
-
 #if H_3D_IV_MERGE
   TComVPSAccess*    getVPSAccess  () { return &m_cVPSAccess;   }
