From: Yaowu Xu <yaowu@google.com>
Date: Wed, 20 Jan 2016 15:47:00 +0000 (-0800)
Subject: Merge branch 'master' into nextgenv2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a40d48621583e1273ec7be80d276042314bf8784;p=libvpx

Merge branch 'master' into nextgenv2

Change-Id: I4e5dd38caa9608252235265c7f2342b183f99815
---

a40d48621583e1273ec7be80d276042314bf8784
diff --cc vp9/common/vp9_pred_common.c
index e4c349c72,1bb11efdf..e0eb0e377
--- a/vp9/common/vp9_pred_common.c
+++ b/vp9/common/vp9_pred_common.c
@@@ -188,11 -188,10 +188,11 @@@ int vp9_get_pred_context_comp_ref_p(con
  
  int vp9_get_pred_context_single_ref_p1(const MACROBLOCKD *xd) {
    int pred_context;
-   const MB_MODE_INFO *const above_mbmi = xd->above_mbmi;
-   const MB_MODE_INFO *const left_mbmi = xd->left_mbmi;
+   const MODE_INFO *const above_mi = xd->above_mi;
+   const MODE_INFO *const left_mi = xd->left_mi;
    const int has_above = xd->up_available;
    const int has_left = xd->left_available;
 +
    // Note:
    // The mode info data structure has a one element border above and to the
    // left of the entries correpsonding to real macroblocks.