Commit e86288d2 authored by Yaowu Xu's avatar Yaowu Xu

Fix a bad merge

Change-Id: I4615e8e64d75b1f4277d2221ec94c5d4f1830aa4
parent 292bd655
......@@ -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);
......
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