Fixing PRED_SWITCHABLE_INTERP case in vp9_get_pred_context function.

Adding xd->up_available as additional check for above context.

Change-Id: If5654e4cae184b9c369b7b2e08076cb2951d00ed

diff --git a/vp9/common/vp9_pred_common.c b/vp9/common/vp9_pred_common.c
index 6376bcd..c12920c 100644 (file)
--- a/vp9/common/vp9_pred_common.c
+++ b/vp9/common/vp9_pred_common.c
@@ -66,7 +66,7 @@ unsigned char vp9_get_pred_context(const VP9_COMMON *const cm,
                     VP9_SWITCHABLE_FILTERS;
 
       // above
-      const int above_in_image = above_mi->mbmi.mb_in_image;
+      const int above_in_image = xd->up_available && above_mi->mbmi.mb_in_image;
       const int above_mv_pred = above_mi->mbmi.mode >= NEARESTMV &&
                                 above_mi->mbmi.mode <= SPLITMV;
       const int above_interp = above_in_image && above_mv_pred ?