Merge "Fixing PRED_SWITCHABLE_INTERP case in vp9_get_pred_context function." into experimental

a2d46434 · Dmitry Kovalev · Gerrit Code Review · ff2b8aa2 · bd994ed4 · a2d46434
Commit a2d46434 authored Apr 24, 2013 by Dmitry Kovalev Committed by Gerrit Code Review Apr 24, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

vp9/common/vp9_pred_common.c vp9/common/vp9_pred_common.c +1 -1

No files found.
--- 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 ?