Merge "Fix a bug in deciding ref frame context in ext-refs" into nextgenv2

2033078a · Zoe Liu · Gerrit Code Review · 966e609e · 27af5230 · 2033078a
Commit 2033078a authored Aug 31, 2016 by Zoe Liu Committed by Gerrit Code Review Aug 31, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

vp10/common/pred_common.c vp10/common/pred_common.c +1 -1

No files found.
--- a/vp10/common/pred_common.c
+++ b/vp10/common/pred_common.c
@@ -600,7 +600,7 @@ int vp10_get_pred_context_comp_bwdref_p(const VP10_COMMON *cm,
      const MB_MODE_INFO *edge_mbmi = above_intra ? left_mbmi : above_mbmi;

      if (!has_second_ref(edge_mbmi))  // single pred (1/3)
-        pred_context = 1 + 2 * (edge_mbmi->ref_frame[1] != cm->comp_bwd_ref[1]);
+        pred_context = 1 + 2 * (edge_mbmi->ref_frame[0] != cm->comp_bwd_ref[1]);
      else  // comp pred (1/3)
        pred_context =
            1 +