Changeset 608 in 3DVCSoftware for trunk/source/Lib/TLibCommon/ContextModel3DBuffer.cpp

Timestamp:

1 Sep 2013, 22:47:26 (11 years ago)

Author:

tech

Message:

Merged DEV-2.0-dev0@604.

File:

• trunk/source/Lib/TLibCommon/ContextModel3DBuffer.cpp (modified) (3 diffs)

trunk/source/Lib/TLibCommon/ContextModel3DBuffer.cpp

@@ -4 +4 @@
  * granted under this license.  
  *
- * Copyright (c) 2010-2012, ITU/ISO/IEC
+ * Copyright (c) 2010-2013, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -73 +73 @@
   {
     m_contextModel[ n ].init( qp, ctxModel[ n ] );
-#if CABAC_INIT_FLAG
     m_contextModel[ n ].setBinsCoded( 0 );
-#endif
   }
 }
 
-#if CABAC_INIT_FLAG
 /**
  * Calculate the cost of choosing a probability table based on the current probability of CABAC at encoder
@@ -121 +118 @@
   return cost;
 }
-#endif
 //! \}