Changeset 1270 in 3DVCSoftware for branches/HTM-14.1-update-dev3/source/Lib/TLibDecoder/TDecCAVLC.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/TLibDecoder/TDecCAVLC.h (modified) (2 diffs)

branches/HTM-14.1-update-dev3/source/Lib/TLibDecoder/TDecCAVLC.h

@@ -117 +117 @@
   Void parseMergeFlag       ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, UInt uiPUIdx );
   Void parseMergeIndex      ( TComDataCU* pcCU, UInt& ruiMergeIndex );
-#if H_3D_ARP 
+#if NH_3D_ARP 
   Void parseARPW            ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
 #endif
@@ -127 +127 @@
   Void  parseSDCFlag        ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
 #endif
-#if H_3D_DBBP
+#if NH_3D_DBBP
   Void  parseDBBPFlag       ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
 #endif