Commit 9e9682fa authored by Nathan E. Egge's avatar Nathan E. Egge Committed by Nathan Egge

Fix EC_ADAPT bug introduced in ad66b816.

When merging NEW_TOKENSET into EC_MULTISYMBOL a bug was introduced when
 EC_MULTISYMBOL == 1 and EC_ADAPT == 0.
This patch reverts that change and replaces CONFIG_EC_MULTISYMBOL with
 the equivalent flag (CONFIG_DAALA_EC || CONFIG_ANS).

BUG=aomedia:550

Change-Id: I164df42121ca0959247af34e65287b1d230346f7
parent 3ca7dd98
......@@ -156,10 +156,11 @@ static int decode_coefs(MACROBLOCKD *xd, PLANE_TYPE type, tran_low_t *dqcoeff,
#endif // CONFIG_AOM_QM
if (counts) {
#if !(CONFIG_DAALA_EC || CONFIG_ANS)
#if !(CONFIG_DAALA_EC || CONFIG_ANS) || !CONFIG_EC_ADAPT
coef_counts = counts->coef[tx_size_ctx][type][ref];
eob_branch_count = counts->eob_branch[tx_size_ctx][type][ref];
#elif !CONFIG_EC_ADAPT
#endif
#if (CONFIG_DAALA_EC || CONFIG_ANS) && !CONFIG_EC_ADAPT
blockz_count = counts->blockz_count[tx_size_ctx][type][ref][ctx];
#endif
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment