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

Timestamp:

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

Author:

tech

Message:

Merged DEV-2.0-dev0@604.

File:

• trunk/source/Lib/TLibCommon/ContextModel3DBuffer.h (modified) (2 diffs)

trunk/source/Lib/TLibCommon/ContextModel3DBuffer.h

@@ -4 +4 @@
  * granted under this license.  
  *
- * Copyright (c) 2010-2012, ITU/ISO/IEC
+ * Copyright (c) 2010-2013, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -83 +83 @@
   Void initBuffer( SliceType eSliceType, Int iQp, UChar* ctxModel );          ///< initialize 3D buffer by slice type & QP
   
-#if CABAC_INIT_FLAG
   UInt calcCost( SliceType sliceType, Int qp, UChar* ctxModel );      ///< determine cost of choosing a probability table based on current probabilities
-#endif
   /** copy from another buffer
    * \param src buffer to copy from