Fix build without dual-filter

Change-Id: I91946940c1540c9f935161da89155ed304055fda

vp10/common/reconinter.c

@@ -474,9 +474,13 @@ void vp10_make_masked_inter_predictor(
   const MODE_INFO *mi = xd->mi[0];
   // The prediction filter types used here should be those for
   // the second reference block.
-  INTERP_FILTER tmp_ipf[4] = {interp_filter[2], interp_filter[3],
-      interp_filter[2], interp_filter[3],
+#if CONFIG_DUAL_FILTER
+  INTERP_FILTER tmp_ipf[4] = {
+    interp_filter[2], interp_filter[3], interp_filter[2], interp_filter[3],
   };
+#else
+  INTERP_FILTER tmp_ipf = interp_filter;
+#endif  // CONFIG_DUAL_FILTER
 #if CONFIG_VP9_HIGHBITDEPTH
   DECLARE_ALIGNED(16, uint8_t, tmp_dst_[2 * MAX_SB_SQUARE]);
   uint8_t *tmp_dst =

vp10/encoder/bitstream.c

@@ -950,11 +950,13 @@ static void write_switchable_interp_filter(VP10_COMP *cpi,
       }
     }
 #else
-    const int ctx = vp10_get_pred_context_switchable_interp(xd);
-    vp10_write_token(w, vp10_switchable_interp_tree,
-                     cm->fc->switchable_interp_prob[ctx],
-                     &switchable_interp_encodings[mbmi->interp_filter]);
-    ++cpi->interp_filter_selected[0][mbmi->interp_filter];
+    {
+      const int ctx = vp10_get_pred_context_switchable_interp(xd);
+      vp10_write_token(w, vp10_switchable_interp_tree,
+                       cm->fc->switchable_interp_prob[ctx],
+                       &switchable_interp_encodings[mbmi->interp_filter]);
+      ++cpi->interp_filter_selected[0][mbmi->interp_filter];
+    }
 #endif
   }
 }