From 9984a155d6bb7b81bbe2260e0f5807208fa103e2 Mon Sep 17 00:00:00 2001 From: Deb Mukherjee Date: Fri, 27 Jul 2012 11:29:46 -0700 Subject: Merges several experiments The following five experiments are merged: newentropy newupdate adaptive_entropy (also includes a couple of parameter changes that improves results a little in common/entropymode.c and encoder/modecosts.c that were not merged from the internal branch) newintramodes expanded_coef_context Change-Id: I8a142a831786ee9dc936f22be1d42a8bced7d270 --- vp8/common/entropymode.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'vp8/common/entropymode.h') diff --git a/vp8/common/entropymode.h b/vp8/common/entropymode.h index 5d753f7e3..f66c1c859 100644 --- a/vp8/common/entropymode.h +++ b/vp8/common/entropymode.h @@ -66,7 +66,5 @@ extern void vp8_accum_mv_refs(VP8_COMMON *pc, void vp8_default_bmode_probs(vp8_prob dest [VP8_BINTRAMODES - 1]); void vp8_kf_default_bmode_probs(vp8_prob dest [VP8_BINTRAMODES] [VP8_BINTRAMODES] [VP8_BINTRAMODES - 1]); -#if CONFIG_ADAPTIVE_ENTROPY void vp8_adapt_mode_probs(struct VP8Common *); #endif -#endif -- cgit v1.2.3