diff options
| author | Deb Mukherjee <debargha@google.com> | 2012-07-27 12:22:55 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-07-27 12:22:55 -0700 |
| commit | 96f9473866194101807869ef6b0259849d233c77 (patch) | |
| tree | 970f1c796fab9ac7c9bae3d00ca4a5742b2f6e20 /vp8/common/entropymode.h | |
| parent | 16945391c33f841306c02a0d7016a036352964aa (diff) | |
| parent | 9984a155d6bb7b81bbe2260e0f5807208fa103e2 (diff) | |
| download | libvpx-96f9473866194101807869ef6b0259849d233c77.tar libvpx-96f9473866194101807869ef6b0259849d233c77.tar.gz libvpx-96f9473866194101807869ef6b0259849d233c77.tar.bz2 libvpx-96f9473866194101807869ef6b0259849d233c77.zip | |
Merge "Merges several experiments" into experimental
Diffstat (limited to 'vp8/common/entropymode.h')
| -rw-r--r-- | vp8/common/entropymode.h | 2 |
1 files changed, 0 insertions, 2 deletions
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 |