Fix a bad merge

Change-Id: I4615e8e64d75b1f4277d2221ec94c5d4f1830aa4

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 874f7e42820af39f9558a5ce31120f6de80b88e3..0eb7737458d3ea673ce743d932a449e7073c9177 100644 (file)
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -242,7 +242,7 @@ static void update_mv_probs(aom_prob *p, int n, aom_reader *r) {
 static void read_mv_probs(nmv_context *ctx, int allow_hp, aom_reader *r) {
   int i;
 
-#if !CONFIG_EC_ADAPT || !CONFIG_EC_MULTISYMBOL
+#if !CONFIG_EC_ADAPT
   int j;
   update_mv_probs(ctx->joints, MV_JOINTS - 1, r);