From: Yaowu Xu <yaowu@google.com>
Date: Mon, 31 Oct 2016 22:56:38 +0000 (-0700)
Subject: Fix a bad merge
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e86288d2de7431114add910bb34955a16f8b3c6d;p=libvpx

Fix a bad merge

Change-Id: I4615e8e64d75b1f4277d2221ec94c5d4f1830aa4
---

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 874f7e428..0eb773745 100644
--- 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);