commit baaaa161869746a5e00d4e34f607062b20fddfca
author Nathan E. Egge <negge@mozilla.com> Mon Oct 24 09:50:52 2016 -0400
committer Yaowu Xu <yaowu@google.com> Sat Oct 29 22:26:27 2016 -0700
tree 60358310d55e5b923c61f492369d59faf45609d5
parent 0575e6c2d46a8bbac3586f0b9925e2e2a33304df

Centralize EC_MULTISYMBOL error checking.

The EC_ADAPT experiment cannot work unless EC_MULTISYMBOL is also
 enabled.
This patch replaces all individual checks with a centralized check in
 both the bitreader.h and bitwriter.h.

Change-Id: I418852d95c5012cc074ed65cd24997e08bc2aadd

aom_dsp/bitreader.h

diff --git a/aom_dsp/bitreader.h b/aom_dsp/bitreader.h
index 00ea158..478945b 100644
--- a/aom_dsp/bitreader.h
+++ b/aom_dsp/bitreader.h
@@ -16,6 +16,10 @@
 #include <limits.h>
 
 #include "./aom_config.h"
+#if CONFIG_EC_ADAPT && !CONFIG_EC_MULTISYMBOL
+#error "CONFIG_EC_ADAPT is enabled without enabling CONFIG_EC_MULTISYMBOL."
+#endif
+
 #include "aom/aomdx.h"
 #include "aom/aom_integer.h"
 #if CONFIG_ANS