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

av1/encoder/tokenize.c

diff --git a/av1/encoder/tokenize.c b/av1/encoder/tokenize.c
index 5aafa79..73f63d3 100644
--- a/av1/encoder/tokenize.c
+++ b/av1/encoder/tokenize.c
@@ -306,12 +306,12 @@
 };
 #endif
 
-#if !CONFIG_RANS
+#if !CONFIG_EC_MULTISYMBOL
 const struct av1_token av1_coef_encodings[ENTROPY_TOKENS] = {
   { 2, 2 },  { 6, 3 },   { 28, 5 },  { 58, 6 },  { 59, 6 },  { 60, 6 },
   { 61, 6 }, { 124, 7 }, { 125, 7 }, { 126, 7 }, { 127, 7 }, { 0, 1 }
 };
-#endif  // !CONFIG_RANS
+#endif  // !CONFIG_EC_MULTISYMBOL
 
 struct tokenize_b_args {
   const AV1_COMP *cpi;