Fix a bad merge

Change-Id: I4615e8e64d75b1f4277d2221ec94c5d4f1830aa4

Fix a bad merge
Change-Id: I4615e8e64d75b1f4277d2221ec94c5d4f1830aa4
e86288d2 · Yaowu Xu · 292bd655 · e86288d2
Commit e86288d2 authored Oct 31, 2016 by Yaowu Xu
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

av1/decoder/decodeframe.c av1/decoder/decodeframe.c +1 -1

No files found.
--- 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);