commit 6577c93e0384cb1f5c90985c5133ce10884575a7
author Timothy B. Terriberry <tterriberry@mozilla.com> Tue Sep 05 12:08:04 2017 -0700
committer Tim Terriberry <tterriberry@mozilla.com> Tue Sep 05 23:47:20 2017 +0000
tree 42fab9942415ae7fcad9b1cd856e19bbfa7b5c0e
parent 02101d1a10fa2ccd8cfc03afd2868f5f69ed05e9

Compile fix for f9ef4f6bcd9e.

Automatic rebasing didn't pick up that an extra instance of the
EC_SMALLMUL flag was added in commit 8711cf5f341d.

However, that commit also broke CONFIG_ANS, since the CDF
probabilities are not inverted in that case. This patch fixes both
issues.

Change-Id: I85b3eb8a4be5b7a392f2f872fc4a90f3fdbf2727

av1/common/onyxc_int.h

diff --git a/av1/common/onyxc_int.h b/av1/common/onyxc_int.h
index 709956d..3ce47b4 100644
--- a/av1/common/onyxc_int.h
+++ b/av1/common/onyxc_int.h
@@ -893,7 +893,7 @@
 
 static INLINE aom_cdf_prob cdf_element_prob(const aom_cdf_prob *cdf,
                                             size_t element) {
-#if CONFIG_EC_SMALLMUL
+#if !CONFIG_ANS
   return (element > 0 ? cdf[element - 1] : CDF_PROB_TOP) - cdf[element];
 #else
   return cdf[element] - (element > 0 ? cdf[element - 1] : 0);