diff options
| author | Deb Mukherjee <debargha@google.com> | 2012-07-27 11:29:46 -0700 |
|---|---|---|
| committer | Deb Mukherjee <debargha@google.com> | 2012-07-27 12:12:39 -0700 |
| commit | 9984a155d6bb7b81bbe2260e0f5807208fa103e2 (patch) | |
| tree | 2918641823325be67304c719165ab25f982ad5e8 /vp8/encoder/boolhuff.c | |
| parent | 10a492847f2af49eb8842b17658c5063fae3689b (diff) | |
| download | libvpx-9984a155d6bb7b81bbe2260e0f5807208fa103e2.tar libvpx-9984a155d6bb7b81bbe2260e0f5807208fa103e2.tar.gz libvpx-9984a155d6bb7b81bbe2260e0f5807208fa103e2.tar.bz2 libvpx-9984a155d6bb7b81bbe2260e0f5807208fa103e2.zip | |
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
Diffstat (limited to 'vp8/encoder/boolhuff.c')
| -rw-r--r-- | vp8/encoder/boolhuff.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/vp8/encoder/boolhuff.c b/vp8/encoder/boolhuff.c index e23d32e85..15fe24136 100644 --- a/vp8/encoder/boolhuff.c +++ b/vp8/encoder/boolhuff.c @@ -65,7 +65,6 @@ void vp8_encode_value(BOOL_CODER *br, int data, int bits) { } -#if CONFIG_NEWUPDATE int recenter_nonneg(int v, int m) { if (v > (m << 1)) return v; else if (v >= m) return ((v - m) << 1); @@ -153,4 +152,3 @@ int vp8_count_term_subexp(int word, int k, int num_syms) { } return count; } -#endif |