Changeset 1270 in 3DVCSoftware for branches/HTM-14.1-update-dev3/source/Lib/TLibEncoder/TEncSbac.h

Timestamp:

13 Jul 2015, 15:22:02 (9 years ago)

Author:

tech

Message:

Merged 14.1-update-dev4-Qualcomm@1266

File:

• branches/HTM-14.1-update-dev3/source/Lib/TLibEncoder/TEncSbac.h (modified) (4 diffs)

branches/HTM-14.1-update-dev3/source/Lib/TLibEncoder/TEncSbac.h

@@ -140 +140 @@
   Void codeMergeFlag     ( TComDataCU* pcCU, UInt uiAbsPartIdx );
   Void codeMergeIndex    ( TComDataCU* pcCU, UInt uiAbsPartIdx );
-#if H_3D_ARP
+#if NH_3D_ARP
   Void codeARPW          ( TComDataCU* pcCU, UInt uiAbsPartIdx );
 #endif
@@ -150 +150 @@
   Void codeSDCFlag       ( TComDataCU* pcCU, UInt uiAbsPartIdx );
 #endif
-#if H_3D_DBBP
+#if NH_3D_DBBP
   Void codeDBBPFlag      ( TComDataCU* pcCU, UInt uiAbsPartIdx );
 #endif
@@ -212 +212 @@
   ContextModel3DBuffer m_cCUMergeFlagExtSCModel;
   ContextModel3DBuffer m_cCUMergeIdxExtSCModel;
-#if H_3D_ARP
+#if NH_3D_ARP
   ContextModel3DBuffer m_cCUPUARPWSCModel;
 #endif
@@ -262 +262 @@
   ContextModel3DBuffer m_cSDCFlagSCModel;
 #endif
-#if H_3D_DBBP
+#if NH_3D_DBBP
   ContextModel3DBuffer m_cDBBPFlagSCModel;
 #endif