From c65fb3a812f64e44b28d9a387a139ab9a0c441a5 Mon Sep 17 00:00:00 2001 From: Jingning Han Date: Mon, 12 Sep 2016 17:34:42 -0700 Subject: [PATCH] Fix compiler failure in ref-mv Fix the compiler failure in ref-mv due to conflict with aom_read changes. Change-Id: Id61e70e2afe1142d0a71e2e0d251b678850d0b88 --- av1/decoder/decodemv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c index da0484149..de5bdc79b 100644 --- a/av1/decoder/decodemv.c +++ b/av1/decoder/decodemv.c @@ -81,7 +81,7 @@ static PREDICTION_MODE read_inter_mode(AV1_COMMON *cm, MACROBLOCKD *xd, if (ctx & (1 << SKIP_NEARESTMV_SUB8X8_OFFSET)) mode_ctx = 8; mode_prob = cm->fc->refmv_prob[mode_ctx]; - if (aom_read(r, mode_prob) == 0, ACCT_STR) { + if (aom_read(r, mode_prob, ACCT_STR) == 0) { if (counts) ++counts->refmv_mode[mode_ctx][0]; return NEARESTMV; } else { @@ -113,7 +113,7 @@ static void read_drl_idx(const AV1_COMMON *cm, MACROBLOCKD *xd, if (xd->ref_mv_count[ref_frame_type] > idx + 1) { uint8_t drl_ctx = av1_drl_ctx(xd->ref_mv_stack[ref_frame_type], idx); aom_prob drl_prob = cm->fc->drl_prob[drl_ctx]; - if (!aom_read(r, drl_prob), ACCT_STR) { + if (!aom_read(r, drl_prob, ACCT_STR)) { mbmi->ref_mv_idx = idx; if (xd->counts) ++xd->counts->drl_mode[drl_ctx][0]; return; @@ -133,7 +133,7 @@ static void read_drl_idx(const AV1_COMMON *cm, MACROBLOCKD *xd, if (xd->ref_mv_count[ref_frame_type] > idx + 1) { uint8_t drl_ctx = av1_drl_ctx(xd->ref_mv_stack[ref_frame_type], idx); aom_prob drl_prob = cm->fc->drl_prob[drl_ctx]; - if (!aom_read(r, drl_prob), ACCT_STR) { + if (!aom_read(r, drl_prob, ACCT_STR)) { mbmi->ref_mv_idx = idx - 1; if (xd->counts) ++xd->counts->drl_mode[drl_ctx][0]; return; -- GitLab