VP9: handle_inter_mode()... Use interp_filter

only if above/left is inter.

Change-Id: I0cc1f926425c021c84536df8271e9ee5f3f87caf

diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c
index 0ed085055873463d91ce10db95984752c0bc2ab5..f606668b28d534ffb6558a7bc02227c4259d8ae3 100644 (file)
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -2465,9 +2465,9 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
 
   if (pred_filter_search) {
     INTERP_FILTER af = SWITCHABLE, lf = SWITCHABLE;
-    if (xd->above_mi)
+    if (xd->above_mi && is_inter_block(xd->above_mi))
       af = xd->above_mi->interp_filter;
-    if (xd->left_mi)
+    if (xd->left_mi && is_inter_block(xd->left_mi))
       lf = xd->left_mi->interp_filter;
 
     if ((this_mode != NEWMV) || (af == lf))