commit 1e4e29f7760d14ae7f52ec869ba92587e742707c
author Alex Converse <aconverse@google.com> Tue Nov 08 14:12:14 2016 -0800
committer Alex Converse <aconverse@google.com> Wed Nov 09 01:25:29 2016 +0000
tree adcac8830af74043ea61558a349db938f1756c0b
parent e38d63c875003031f36fb9f9a781fa2f4e06632f

Fix rans ec_multisymbol merge issues.

The rans experiment is dead. The ans experiment with the ec_multisymbol
experiment also turned on takes its place.

Change-Id: Ie9f30ec7cf73aae6b2ea580a7b1f208485a8a7a7

aom_dsp/bitreader.h

diff --git a/aom_dsp/bitreader.h b/aom_dsp/bitreader.h
index 478945b..6121273 100644
--- a/aom_dsp/bitreader.h
+++ b/aom_dsp/bitreader.h
@@ -211,7 +211,7 @@
 static INLINE int aom_read_symbol_(aom_reader *r, aom_cdf_prob *cdf,
                                    int nsymbs ACCT_STR_PARAM) {
   int ret;
-#if CONFIG_RANS
+#if CONFIG_ANS
   (void)nsymbs;
   ret = rans_read(r, cdf);
 #elif CONFIG_DAALA_EC