summaryrefslogtreecommitdiff
path: root/vp8/common/entropy.h
diff options
context:
space:
mode:
Diffstat (limited to 'vp8/common/entropy.h')
-rw-r--r--vp8/common/entropy.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/vp8/common/entropy.h b/vp8/common/entropy.h
index aa1faca43..8bb718a06 100644
--- a/vp8/common/entropy.h
+++ b/vp8/common/entropy.h
@@ -89,17 +89,11 @@ extern DECLARE_ALIGNED(64, const unsigned char, vp8_coef_bands_8x8[64]);
distinct bands). */
/*# define DC_TOKEN_CONTEXTS 3*/ /* 00, 0!0, !0!0 */
-#if CONFIG_EXPANDED_COEF_CONTEXT
#define PREV_COEF_CONTEXTS 4
-#else
-#define PREV_COEF_CONTEXTS 3
-#endif
-#if CONFIG_NEWUPDATE
#define SUBEXP_PARAM 4 /* Subexponential code parameter */
#define MODULUS_PARAM 13 /* Modulus parameter */
#define COEFUPDATETYPE 1 /* coef update type to use (1/2/3) */
-#endif
extern DECLARE_ALIGNED(16, const unsigned char, vp8_prev_token_class[MAX_ENTROPY_TOKENS]);
@@ -118,7 +112,5 @@ extern DECLARE_ALIGNED(64, const int, vp8_default_zig_zag1d_8x8[64]);
extern short vp8_default_zig_zag_mask_8x8[64];// int64_t
void vp8_coef_tree_initialize(void);
-#if CONFIG_ADAPTIVE_ENTROPY
void vp8_adapt_coef_probs(struct VP8Common *);
#endif
-#endif