Changeset 433 in 3DVCSoftware for branches/HTM-6.2-dev0/source/Lib/TLibEncoder/TEncCavlc.cpp

Timestamp:

22 May 2013, 21:05:43 (12 years ago)

Author:

tech

Message:

Merged HTM-6.2-dev3-RWTH-Fix Rev. 415

File:

• branches/HTM-6.2-dev0/source/Lib/TLibEncoder/TEncCavlc.cpp (modified) (3 diffs)

branches/HTM-6.2-dev0/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -1436 +1436 @@
 }
 
-Void TEncCavlc::codeIntraDirLumaAng( TComDataCU* pcCU, UInt uiAbsPartIdx )
+Void TEncCavlc::codeIntraDirLumaAng( TComDataCU* pcCU, UInt uiAbsPartIdx 
+#if PKU_QC_DEPTH_INTRA_UNI_D0195
+                                    , Bool bSdcRD
+#endif
+                                    )
 {
   assert(0);
@@ -1915 +1919 @@
 
 #if RWTH_SDC_DLT_B0036
+#if !PKU_QC_DEPTH_INTRA_UNI_D0195
 Void TEncCavlc::codeSDCFlag ( TComDataCU* pcCU, UInt uiAbsPartIdx )
 {
   assert(0);
 }
-
+#endif
 Void TEncCavlc::codeSDCResidualData  ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiSegment )
 {
   assert(0);
 }
-
+#if !PKU_QC_DEPTH_INTRA_UNI_D0195
 Void TEncCavlc::codeSDCPredMode ( TComDataCU* pcCU, UInt uiAbsPartIdx )
 {
@@ -1930 +1935 @@
 }
 #endif
+#endif
 //! \}