Index: branches/HTM-5.0-Qualcomm/source/App/TAppEncoder/TAppEncCfg.cpp
===================================================================
--- branches/HTM-5.0-Qualcomm/source/App/TAppEncoder/TAppEncCfg.cpp	(revision 194)
+++ branches/HTM-5.0-Qualcomm/source/App/TAppEncoder/TAppEncCfg.cpp	(revision 195)
@@ -329,5 +329,5 @@
   /* Camera Paremetes */
   ("CameraParameterFile,cpf", m_pchCameraParameterFile,    (Char *) 0, "Camera Parameter File Name")
-#if MVHEVC
+#if QC_MVHEVC_B0046
   ("BaseViewCameraNumbers" ,  m_aiVId,     std::vector<Int>(1, MAX_VIEW_NUM), "Numbers of base views")
 #endif
@@ -789,5 +789,5 @@
 }
 #else
-#if !MVHEVC
+#if !QC_MVHEVC_B0046
   m_cCameraData     .init     ( (UInt)m_iNumberOfViews,
     m_uiInputBitDepth,
@@ -806,5 +806,5 @@
   // check validity of input parameters
   xCheckParameter();
-#if !MVHEVC
+#if !QC_MVHEVC_B0046
   m_cCameraData.check( false, true );
 #endif
Index: branches/HTM-5.0-Qualcomm/source/App/TAppEncoder/TAppEncCfg.h
===================================================================
--- branches/HTM-5.0-Qualcomm/source/App/TAppEncoder/TAppEncCfg.h	(revision 194)
+++ branches/HTM-5.0-Qualcomm/source/App/TAppEncoder/TAppEncCfg.h	(revision 195)
@@ -109,5 +109,5 @@
   std::vector<Double>  m_adQP;                                ///< QP value of key-picture (floating point) [0] video, [1] depth
   std::vector<Int>     m_aiQP;                                ///< QP value of key-picture (integer) [0] video, [1] depth
-#if MVHEVC
+#if QC_MVHEVC_B0046
   std::vector<Int>     m_aiVId;                                ///< view id
 #endif
@@ -288,5 +288,5 @@
   Char*     m_pchCameraParameterFile;                         ///< camera parameter file
   Char*     m_pchBaseViewCameraNumbers;
-#if !MVHEVC
+#if !QC_MVHEVC_B0046
   TAppComCamPara m_cCameraData;
 #endif
Index: branches/HTM-5.0-Qualcomm/source/App/TAppEncoder/TAppEncTop.cpp
===================================================================
--- branches/HTM-5.0-Qualcomm/source/App/TAppEncoder/TAppEncTop.cpp	(revision 194)
+++ branches/HTM-5.0-Qualcomm/source/App/TAppEncoder/TAppEncTop.cpp	(revision 195)
@@ -67,11 +67,11 @@
 Void TAppEncTop::xInitLibCfg()
 {
-#if VIDYO_VPS_INTEGRATION|MVHEVC
-#if !MVHEVC
+#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
+#if !QC_MVHEVC_B0046
   UInt layerId = 0;
 #endif
   // TODO: fix the assumption here that the temporal structures are all equal across all layers???
   m_cVPS.setMaxTLayers( m_maxTempLayer[0] );
-#if MVHEVC
+#if QC_MVHEVC_B0046
   m_cVPS.setMaxLayers( m_iNumberOfViews );
 #else
@@ -107,5 +107,5 @@
     m_acTEncTopList[iViewIdx]->setViewId                       ( iViewIdx );
     m_acTEncTopList[iViewIdx]->setIsDepth                      ( false );
-#if MVHEVC
+#if QC_MVHEVC_B0046
     m_acTEncTopList[iViewIdx]->setLayerId                      ( iViewIdx );
     m_cVPS.setViewId                                           ( m_aiVId[ iViewIdx ], iViewIdx );
@@ -417,5 +417,5 @@
       m_acTEncDepthTopList[iViewIdx]->setViewId                       ( iViewIdx );
       m_acTEncDepthTopList[iViewIdx]->setIsDepth                      ( true );
-#if MVHEVC
+#if QC_MVHEVC_B0046
       m_acTEncDepthTopList[iViewIdx]->setLayerId                      ( iViewIdx );
 #else
@@ -836,5 +836,5 @@
   {
     m_acTEncTopList[iViewIdx]->init( this );
-#if MVHEVC
+#if QC_MVHEVC_B0046
   //set setNumDirectRefLayer
   Int iNumDirectRef = m_acTEncTopList[iViewIdx]->getSPS()->getNumberOfUsableInterViewRefs();
@@ -887,5 +887,5 @@
   TComPicYuv*       pcPicYuvOrg = new TComPicYuv;
   TComPicYuv*       pcDepthPicYuvOrg = new TComPicYuv;
-#if !MVHEVC
+#if !QC_MVHEVC_B0046
   TComPicYuv*       pcPdmDepthOrg    = new TComPicYuv;
 #endif
@@ -990,5 +990,5 @@
     {
       Int  iNumEncoded = 0;
-#if !MVHEVC
+#if !QC_MVHEVC_B0046
       UInt iNextPoc = m_acTEncTopList[0] -> getFrameId( gopId );
       if ( iNextPoc < m_iFrameToBeEncoded )
@@ -1052,6 +1052,6 @@
   pcDepthPicYuvOrg = NULL;
 
-#if !MVHEVC
-#if BUG_FIX_HTM
+#if !QC_MVHEVC_B0046
+#if FIX_DEL_NULLPTR
   if ( pcPdmDepthOrg != NULL && m_uiMultiviewMvRegMode )
 #else
@@ -1267,5 +1267,5 @@
     case NAL_UNIT_CODED_SLICE:
 #if H0566_TLA
-#if !QC_REM_IDV
+#if !QC_REM_IDV_B0046
     case NAL_UNIT_CODED_SLICE_IDV:
 #endif
Index: branches/HTM-5.0-Qualcomm/source/App/TAppEncoder/TAppEncTop.h
===================================================================
--- branches/HTM-5.0-Qualcomm/source/App/TAppEncoder/TAppEncTop.h	(revision 194)
+++ branches/HTM-5.0-Qualcomm/source/App/TAppEncoder/TAppEncTop.h	(revision 195)
@@ -87,5 +87,5 @@
 #endif
 
-#if VIDYO_VPS_INTEGRATION|MVHEVC
+#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
   TComVPS                     m_cVPS;
 #endif
@@ -139,5 +139,5 @@
 #endif
   
-#if MVHEVC
+#if QC_MVHEVC_B0046
   TComVPS*          getVPS()  { return &m_cVPS; }
 #endif