Index: branches/HTM-5.0-Qualcomm/source/App/TAppDecoder/TAppDecTop.cpp
===================================================================
--- branches/HTM-5.0-Qualcomm/source/App/TAppDecoder/TAppDecTop.cpp	(revision 194)
+++ branches/HTM-5.0-Qualcomm/source/App/TAppDecoder/TAppDecTop.cpp	(revision 195)
@@ -82,5 +82,5 @@
 Void TAppDecTop::decode()
 {
-#if VIDYO_VPS_INTEGRATION|MVHEVC
+#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
   increaseNumberOfViews( 0, 0, 0 );
 #else
@@ -145,5 +145,5 @@
     {
       read(nalu, nalUnit);
-#if MVHEVC
+#if QC_MVHEVC_B0046
     viewDepthId = nalu.m_layerId;
     Int depth = 0;
@@ -171,5 +171,5 @@
       if( viewDepthId >= m_tDecTop.size() )      
       {
-#if VIDYO_VPS_INTEGRATION|MVHEVC
+#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
         increaseNumberOfViews( viewDepthId, viewId, depth );
 #else
@@ -200,5 +200,5 @@
       if( !(m_iMaxTemporalLayer >= 0 && nalu.m_temporalId > m_iMaxTemporalLayer) )
       {
-#if MVHEVC
+#if QC_MVHEVC_B0046
         if(viewDepthId && m_tDecTop[viewDepthId]->m_bFirstNal== false)
         {
@@ -233,5 +233,5 @@
     if( pcListPic[viewDepthId] )
     {
-#if QC_REM_IDV
+#if QC_REM_IDV_B0046
       Int iviewId = m_tDecTop[viewDepthId]->getViewId();
       if( newPicture[viewDepthId] && (nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_IDR || ((nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_IDR && iviewId) && m_tDecTop[viewDepthId]->getNalUnitTypeBaseView() == NAL_UNIT_CODED_SLICE_IDR)) )
@@ -295,5 +295,5 @@
         m_tDecTop[viewDepthIdx]->destroy() ;
       }
-#if MVHEVC
+#if QC_MVHEVC_B0046
       if(viewDepthIdx)
       {
@@ -445,5 +445,5 @@
   m_pocLastDisplay[viewDepthId] = -MAX_INT;
 }
-#if VIDYO_VPS_INTEGRATION|MVHEVC
+#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
 Void  TAppDecTop::increaseNumberOfViews  ( UInt layerId, UInt viewId, UInt isDepth )
 #else
@@ -451,5 +451,5 @@
 #endif
 {
-#if VIDYO_VPS_INTEGRATION|MVHEVC
+#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
   Int newNumberOfViewDepth = layerId + 1;
 #endif
@@ -458,5 +458,5 @@
     m_outputBitDepth = g_uiBitDepth + g_uiBitIncrement;
   }
-#if !VIDYO_VPS_INTEGRATION&!MVHEVC
+#if !VIDYO_VPS_INTEGRATION&!QC_MVHEVC_B0046
   Int viewId = (newNumberOfViewDepth-1)>>1;   // coding order T0D0T1D1T2D2
   Bool isDepth = ((newNumberOfViewDepth % 2) == 0);  // coding order T0D0T1D1T2D2
@@ -471,5 +471,5 @@
       m_tVideoIOYuvReconFile.push_back(new TVideoIOYuv);
       Char buffer[4];
-#if VIDYO_VPS_INTEGRATION|MVHEVC
+#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
       sprintf(buffer,"_%i", viewId );
 #else
@@ -477,5 +477,5 @@
 #endif
       Char* nextFilename = NULL;
-#if VIDYO_VPS_INTEGRATION|MVHEVC
+#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
       if( isDepth)
 #else
@@ -492,5 +492,5 @@
         xAppendToFileNameEnd( m_pchReconFile, buffer, nextFilename);
       }
-#if !VIDYO_VPS_INTEGRATION&!MVHEVC
+#if !VIDYO_VPS_INTEGRATION&!QC_MVHEVC_B0046
       if( isDepth || ( !isDepth && (m_tVideoIOYuvReconFile.size() % 2) == 1 ) )
 #endif
@@ -509,5 +509,5 @@
   {
     m_tDecTop.push_back(new TDecTop);
-#if !VIDYO_VPS_INTEGRATION&!MVHEVC
+#if !VIDYO_VPS_INTEGRATION&!QC_MVHEVC_B0046
     if( isDepth || ( !isDepth && (m_tVideoIOYuvReconFile.size() % 2) == 1 ) )
     {
@@ -519,5 +519,5 @@
       m_tDecTop.back()->setPictureDigestEnabled(m_pictureDigestEnabled);
       m_tDecTop.back()->setCamParsCollector( &m_cCamParsCollector );
-#if !VIDYO_VPS_INTEGRATION&!MVHEVC
+#if !VIDYO_VPS_INTEGRATION&!QC_MVHEVC_B0046
     }
 #endif
Index: branches/HTM-5.0-Qualcomm/source/App/TAppDecoder/TAppDecTop.h
===================================================================
--- branches/HTM-5.0-Qualcomm/source/App/TAppDecoder/TAppDecTop.h	(revision 194)
+++ branches/HTM-5.0-Qualcomm/source/App/TAppDecoder/TAppDecTop.h	(revision 195)
@@ -74,5 +74,5 @@
   CamParsCollector                m_cCamParsCollector;
 #if DEPTH_MAP_GENERATION
-#if VIDYO_VPS_INTEGRATION|MVHEVC
+#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
   TComVPSAccess                   m_cVPSAccess;
 #endif
@@ -88,5 +88,5 @@
   Void  destroy           (); ///< destroy internal members
   Void  decode            (); ///< main decoding function
-#if VIDYO_VPS_INTEGRATION|MVHEVC
+#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
   Void  increaseNumberOfViews  (UInt layerId, UInt viewId, UInt isDepth);
 #else
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
Index: branches/HTM-5.0-Qualcomm/source/App/TAppRenderer/RendererMain.cpp
===================================================================
--- branches/HTM-5.0-Qualcomm/source/App/TAppRenderer/RendererMain.cpp	(revision 194)
+++ branches/HTM-5.0-Qualcomm/source/App/TAppRenderer/RendererMain.cpp	(revision 195)
@@ -43,5 +43,5 @@
 int main(int argc, char* argv[])
   {
-#if !MVHEVC
+#if !QC_MVHEVC_B0046
   TAppRendererTop  cTAppRendererTop;
 
Index: branches/HTM-5.0-Qualcomm/source/App/TAppRenderer/TAppRendererCfg.cpp
===================================================================
--- branches/HTM-5.0-Qualcomm/source/App/TAppRenderer/TAppRendererCfg.cpp	(revision 194)
+++ branches/HTM-5.0-Qualcomm/source/App/TAppRenderer/TAppRendererCfg.cpp	(revision 195)
@@ -59,5 +59,5 @@
 // Constructor / destructor / initialization / destroy
 // ====================================================================================================================
-#if !MVHEVC
+#if !QC_MVHEVC_B0046
 TAppRendererCfg::TAppRendererCfg()
 {
Index: branches/HTM-5.0-Qualcomm/source/App/TAppRenderer/TAppRendererCfg.h
===================================================================
--- branches/HTM-5.0-Qualcomm/source/App/TAppRenderer/TAppRendererCfg.h	(revision 194)
+++ branches/HTM-5.0-Qualcomm/source/App/TAppRenderer/TAppRendererCfg.h	(revision 195)
@@ -50,5 +50,5 @@
 #include <string>
 #include <vector>
-#if !MVHEVC
+#if !QC_MVHEVC_B0046
 // ====================================================================================================================
 // Class definition
Index: branches/HTM-5.0-Qualcomm/source/App/TAppRenderer/TAppRendererTop.cpp
===================================================================
--- branches/HTM-5.0-Qualcomm/source/App/TAppRenderer/TAppRendererTop.cpp	(revision 194)
+++ branches/HTM-5.0-Qualcomm/source/App/TAppRenderer/TAppRendererTop.cpp	(revision 195)
@@ -45,5 +45,5 @@
 // Constructor / destructor / initialization / destroy
 // ====================================================================================================================
-#if !MVHEVC
+#if !QC_MVHEVC_B0046
 TAppRendererTop::TAppRendererTop()
 {
Index: branches/HTM-5.0-Qualcomm/source/App/TAppRenderer/TAppRendererTop.h
===================================================================
--- branches/HTM-5.0-Qualcomm/source/App/TAppRenderer/TAppRendererTop.h	(revision 194)
+++ branches/HTM-5.0-Qualcomm/source/App/TAppRenderer/TAppRendererTop.h	(revision 195)
@@ -50,5 +50,5 @@
 #include "../../Lib/TLibRenderer/TRenModel.h"
 
-#if !MVHEVC
+#if !QC_MVHEVC_B0046
 // ====================================================================================================================
 // Class definition
