Index: branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/NALwrite.cpp
===================================================================
--- branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/NALwrite.cpp	(revision 194)
+++ branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/NALwrite.cpp	(revision 195)
@@ -64,5 +64,5 @@
 #endif
 
-#if MVHEVC
+#if QC_MVHEVC_B0046
   bsNALUHeader.write(nalu.m_layerId,        5); // when nal_ref_flag is signalled, 5 bits here. otherwise, 6 bits
   bsNALUHeader.write(nalu.m_temporalId + 1, 3); // temporal_id
@@ -83,5 +83,5 @@
   case NAL_UNIT_CODED_SLICE_IDR:
 #if H0566_TLA
-#if !QC_REM_IDV
+#if !QC_REM_IDV_B0046
   case NAL_UNIT_CODED_SLICE_IDV:
 #endif
@@ -202,5 +202,5 @@
 }
 
-#if !MVHEVC
+#if !QC_MVHEVC_B0046
 /**
  * Copy NALU from naluSrc to naluDest
Index: branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/NALwrite.h
===================================================================
--- branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/NALwrite.h	(revision 194)
+++ branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/NALwrite.h	(revision 195)
@@ -62,5 +62,5 @@
     NalRefIdc nalRefIDC,
 #endif
-#if VIDYO_VPS_INTEGRATION|MVHEVC
+#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
     unsigned layerId,
 #else
@@ -70,5 +70,5 @@
     unsigned temporalID = 0)
 #if NAL_REF_FLAG
-#if VIDYO_VPS_INTEGRATION|MVHEVC
+#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
   : NALUnit(nalUnitType, nalRefFlag, layerId, temporalID)
 #else
Index: branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncCavlc.cpp
===================================================================
--- branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncCavlc.cpp	(revision 194)
+++ branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncCavlc.cpp	(revision 195)
@@ -375,5 +375,5 @@
 }
 
-#if MVHEVC
+#if QC_MVHEVC_B0046
 Void TEncCavlc::codeVPS( TComVPS* pcVPS )
 {
@@ -708,5 +708,5 @@
 #endif
   WRITE_FLAG( 1, "sps_extension_flag" );
-#if !MVHEVC
+#if !QC_MVHEVC_B0046
   WRITE_FLAG( (pcSPS->getNumberOfUsableInterViewRefs() > 0) ? 1 : 0, "interview_refs_present_flag" );
   if( pcSPS->getNumberOfUsableInterViewRefs() > 0 )
@@ -884,5 +884,5 @@
   if (!bEntropySlice)
   {
-#if MVHEVC
+#if QC_MVHEVC_B0046
     WRITE_UVLC( 0, "pic_parameter_set_id" );
 #else
@@ -895,5 +895,5 @@
     }
 #endif
-#if QC_REM_IDV
+#if QC_REM_IDV_B0046
     if(pcSlice->getNalUnitType()==NAL_UNIT_CODED_SLICE_IDR && pcSlice->getViewId() == 0) 
 #else
@@ -907,5 +907,5 @@
     {
       WRITE_CODE( (pcSlice->getPOC()-pcSlice->getLastIDR()+(1<<pcSlice->getSPS()->getBitsForPOC()))%(1<<pcSlice->getSPS()->getBitsForPOC()), pcSlice->getSPS()->getBitsForPOC(), "pic_order_cnt_lsb");
-#if QC_REM_IDV
+#if QC_REM_IDV_B0046
       if( pcSlice->getPOC() == 0 && !(pcSlice->getSPS()->getViewId() && (pcSlice->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR || pcSlice->getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA)))
 #else
Index: branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncCavlc.h
===================================================================
--- branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncCavlc.h	(revision 194)
+++ branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncCavlc.h	(revision 195)
@@ -114,5 +114,5 @@
   UInt  getCoeffCost          ()                { return  m_uiCoeffCost;  }
   
-#if VIDYO_VPS_INTEGRATION|MVHEVC
+#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
   Void  codeVPS                 ( TComVPS* pcVPS );
 #endif
Index: branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncCfg.h
===================================================================
--- branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncCfg.h	(revision 194)
+++ branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncCfg.h	(revision 195)
@@ -307,5 +307,5 @@
 #endif
 
-#if VIDYO_VPS_INTEGRATION|MVHEVC
+#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
   UInt     m_layerId;
 #endif
@@ -820,5 +820,5 @@
   Int       getTSIG()                            { return m_signHidingThreshold; }
 #endif
-#if VIDYO_VPS_INTEGRATION |MVHEVC
+#if VIDYO_VPS_INTEGRATION |QC_MVHEVC_B0046
   Void      setLayerId             ( UInt layerId )   { m_layerId = layerId; }
   UInt      getLayerId             ()               { return m_layerId; }
Index: branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncEntropy.cpp
===================================================================
--- branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncEntropy.cpp	(revision 194)
+++ branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncEntropy.cpp	(revision 195)
@@ -121,5 +121,5 @@
 }
 
-#if VIDYO_VPS_INTEGRATION|MVHEVC
+#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
 Void TEncEntropy::encodeVPS( TComVPS* pcVPS )
 {
@@ -129,5 +129,5 @@
 #endif
 
-#if VIDYO_VPS_INTEGRATION|MVHEVC
+#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
 Void  codeVPS                 ( TComVPS* pcVPS );
 #endif
Index: branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncEntropy.h
===================================================================
--- branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncEntropy.h	(revision 194)
+++ branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncEntropy.h	(revision 195)
@@ -76,5 +76,5 @@
   virtual UInt  getCoeffCost          ()                = 0;
 
-#if VIDYO_VPS_INTEGRATION|MVHEVC
+#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
   virtual Void  codeVPS                 ( TComVPS* pcVPS )                                      = 0;
 #endif
@@ -242,5 +242,5 @@
   
 public:
-#if VIDYO_VPS_INTEGRATION|MVHEVC
+#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
   Void encodeVPS               ( TComVPS* pcVPS);
 #endif
Index: branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncGOP.cpp
===================================================================
--- branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncGOP.cpp	(revision 194)
+++ branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncGOP.cpp	(revision 195)
@@ -246,5 +246,5 @@
 
       std::vector<TComAPS>& vAPS = m_pcEncTop->getAPS();
-#if VIDYO_VPS_INTEGRATION|MVHEVC
+#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
     m_pcSliceEncoder->initEncSlice ( pcPic, iPOCLast, uiPOCCurr, iNumPicRcvd, iGOPid, pcSlice, m_pcEncTop->getEncTop()->getVPS(), m_pcEncTop->getSPS(), m_pcEncTop->getPPS() );
 #else
@@ -298,5 +298,5 @@
       if( pcSlice->getSliceType() == B_SLICE )
       {
-#if QC_REM_IDV
+#if QC_REM_IDV_B0046
       if( m_pcCfg->getGOPEntry(pcSlice->getSPS()->getViewId() && ((getNalUnitType(uiPOCCurr) == NAL_UNIT_CODED_SLICE_IDR) || (getNalUnitType(uiPOCCurr) == NAL_UNIT_CODED_SLICE_CRA))? MAX_GOP : iGOPid ).m_sliceType == 'P' ) { pcSlice->setSliceType( P_SLICE ); }
 #else
@@ -336,5 +336,5 @@
 #endif
 
-#if !QC_REM_IDV
+#if !QC_REM_IDV_B0046
       pcSlice->setNumRefIdx( REF_PIC_LIST_0, min( m_pcCfg->getGOPEntry( (getNalUnitType(uiPOCCurr) == NAL_UNIT_CODED_SLICE_IDV) ? MAX_GOP : iGOPid ).m_numRefPicsActive, (pcSlice->getRPS()->getNumberOfPictures() + pcSlice->getSPS()->getNumberOfUsableInterViewRefs()) ) );
       pcSlice->setNumRefIdx( REF_PIC_LIST_1, min( m_pcCfg->getGOPEntry( (getNalUnitType(uiPOCCurr) == NAL_UNIT_CODED_SLICE_IDV) ? MAX_GOP : iGOPid ).m_numRefPicsActive, (pcSlice->getRPS()->getNumberOfPictures() + pcSlice->getSPS()->getNumberOfUsableInterViewRefs()) ) );
@@ -373,5 +373,5 @@
       if( pcSlice->getSliceType() == B_SLICE )
       {
-#if !QC_REM_IDV
+#if !QC_REM_IDV_B0046
         if( m_pcCfg->getGOPEntry( (getNalUnitType(uiPOCCurr) == NAL_UNIT_CODED_SLICE_IDV) ? MAX_GOP : iGOPid ).m_sliceType == 'P' ) { pcSlice->setSliceType( P_SLICE ); }
 #else
@@ -845,9 +845,9 @@
       if ( m_bSeqFirst )
       {
-#if MVHEVC
+#if QC_MVHEVC_B0046
       if(!m_pcEncTop->getLayerId())
       {
 #endif
-#if VIDYO_VPS_INTEGRATION|MVHEVC
+#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
         {
           OutputNALUnit nalu(NAL_UNIT_VPS, true, m_pcEncTop->getLayerId());
@@ -859,5 +859,5 @@
 #endif
 #if NAL_REF_FLAG
-#if VIDYO_VPS_INTEGRATION|MVHEVC
+#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
         OutputNALUnit nalu(NAL_UNIT_SPS, true, m_pcEncTop->getLayerId());
 #else
@@ -880,6 +880,6 @@
 
 #if NAL_REF_FLAG
-#if VIDYO_VPS_INTEGRATION|MVHEVC 
-#if MVHEVC
+#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046 
+#if QC_MVHEVC_B0046
         nalu = NALUnit(NAL_UNIT_PPS, true, m_pcEncTop->getLayerId());
 #else
@@ -896,5 +896,5 @@
         writeRBSPTrailingBits(nalu.m_Bitstream);
         accessUnit.push_back(new NALUnitEBSP(nalu));
-#if MVHEVC
+#if QC_MVHEVC_B0046
       }
 #endif
@@ -1018,5 +1018,5 @@
 #if NAL_REF_FLAG
         OutputNALUnit nalu( pcSlice->getNalUnitType(), pcSlice->isReferenced(),
-#if !VIDYO_VPS_INTEGRATION &!MVHEVC
+#if !VIDYO_VPS_INTEGRATION &!QC_MVHEVC_B0046
                            m_pcEncTop->getViewId(), m_pcEncTop->getIsDepth(), pcSlice->getTLayer() );
 #else
@@ -1494,5 +1494,5 @@
           {
 #if NAL_REF_FLAG
-#if VIDYO_VPS_INTEGRATION | MVHEVC
+#if VIDYO_VPS_INTEGRATION | QC_MVHEVC_B0046
             OutputNALUnit nalu(NAL_UNIT_APS, true, m_pcEncTop->getLayerId());
 #else
@@ -1560,5 +1560,5 @@
 
 #if NAL_REF_FLAG
-#if VIDYO_VPS_INTEGRATION | MVHEVC
+#if VIDYO_VPS_INTEGRATION | QC_MVHEVC_B0046
         OutputNALUnit nalu(NAL_UNIT_SEI, false, m_pcEncTop->getLayerId());
 #else
@@ -1998,5 +1998,5 @@
   case NAL_UNIT_CODED_SLICE: return "SLICE";
 #if H0566_TLA
-#if !QC_REM_IDV
+#if !QC_REM_IDV_B0046
   case NAL_UNIT_CODED_SLICE_IDV: return "IDV";
 #endif
@@ -2215,5 +2215,5 @@
     if( bInterViewOnlySlice ) 
     { 
-#if !QC_REM_IDV
+#if !QC_REM_IDV_B0046
       return NAL_UNIT_CODED_SLICE_IDV; 
 #else
@@ -2232,5 +2232,5 @@
       if( bInterViewOnlySlice ) 
       { 
-#if !QC_REM_IDV
+#if !QC_REM_IDV_B0046
         return NAL_UNIT_CODED_SLICE_IDV; 
 #else
@@ -2251,5 +2251,5 @@
       if( bInterViewOnlySlice ) 
       { 
-#if !QC_REM_IDV
+#if !QC_REM_IDV_B0046
         return NAL_UNIT_CODED_SLICE_IDV; 
 #else
@@ -2493,5 +2493,5 @@
 
   // analyze inter-view modifications
-#if !QC_REM_IDV
+#if !QC_REM_IDV_B0046
   GOPEntryMvc gem = m_pcCfg->getGOPEntry( (getNalUnitType(uiPOCCurr) == NAL_UNIT_CODED_SLICE_IDV) ? MAX_GOP : iGOPid );
 #else
Index: branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncSbac.cpp
===================================================================
--- branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncSbac.cpp	(revision 194)
+++ branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncSbac.cpp	(revision 195)
@@ -396,5 +396,5 @@
 }
 
-#if VIDYO_VPS_INTEGRATION|MVHEVC
+#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
 Void TEncSbac::codeVPS( TComVPS* pcVPS )
 {
Index: branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncSbac.h
===================================================================
--- branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncSbac.h	(revision 194)
+++ branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncSbac.h	(revision 195)
@@ -98,5 +98,5 @@
   //--SBAC RD
 
-#if VIDYO_VPS_INTEGRATION|MVHEVC
+#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
   Void  codeVPS                 ( TComVPS* pcVPS );
 #endif
Index: branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncSearch.cpp
===================================================================
--- branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncSearch.cpp	(revision 194)
+++ branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncSearch.cpp	(revision 195)
@@ -4284,5 +4284,5 @@
   }
 #endif
-#if MVHEVC
+#if QC_MVHEVC_B0046
   m_pcRdCost->setMultiviewReg( 0 );
 #endif
Index: branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncSlice.cpp
===================================================================
--- branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncSlice.cpp	(revision 194)
+++ branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncSlice.cpp	(revision 195)
@@ -162,5 +162,5 @@
  \param pPPS          PPS associated with the slice
  */
-#if VIDYO_VPS_INTEGRATION|MVHEVC
+#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
 Void TEncSlice::initEncSlice( TComPic* pcPic, Int iPOCLast, UInt uiPOCCurr, Int iNumPicRcvd, Int iGOPid, TComSlice*& rpcSlice, TComVPS * pVPS, TComSPS* pSPS, TComPPS *pPPS )
 #else
@@ -172,5 +172,5 @@
   
   rpcSlice = pcPic->getSlice(0);
-#if VIDYO_VPS_INTEGRATION|MVHEVC
+#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
   rpcSlice->setVPS( pVPS );
 #endif
@@ -820,5 +820,5 @@
   UInt uiTileStartLCU = 0;
   UInt uiTileLCUX     = 0;
-#if !MVHEVC
+#if !QC_MVHEVC_B0046
   Int iLastPosY = -1;
 #endif
@@ -833,5 +833,5 @@
     TComDataCU*& pcCU = rpcPic->getCU( uiCUAddr );
     pcCU->initCU( rpcPic, uiCUAddr );
-#if !MVHEVC
+#if !QC_MVHEVC_B0046
     if ( m_pcRdCost->getUseRenModel() )
     {
Index: branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncSlice.h
===================================================================
--- branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncSlice.h	(revision 194)
+++ branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncSlice.h	(revision 195)
@@ -110,5 +110,5 @@
   
   /// preparation of slice encoding (reference marking, QP and lambda)
-#if VIDYO_VPS_INTEGRATION|MVHEVC
+#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
   Void    initEncSlice        ( TComPic*  pcPic, Int iPOCLast, UInt uiPOCCurr, Int iNumPicRcvd, Int iGOPid, TComSlice*& rpcSlice, TComVPS* pVPS, TComSPS* pSPS, TComPPS *pPPS );
 #else
Index: branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncTop.cpp
===================================================================
--- branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncTop.cpp	(revision 194)
+++ branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncTop.cpp	(revision 195)
@@ -785,5 +785,5 @@
   else
   {
-#if MVHEVC
+#if QC_MVHEVC_B0046
     m_cSPS.initMultiviewSPS   ( m_viewId);
 #else
@@ -997,5 +997,5 @@
 Void TEncTop::selectReferencePictureSet(TComSlice* slice, Int POCCurr, Int GOPid,TComList<TComPic*>& listPic )
 {
-#if QC_REM_IDV
+#if QC_REM_IDV_B0046
   if( (slice->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR ||slice->getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA) && slice->getSPS()->getViewId() && POCCurr == 0 )
 #else
