Merge ext_interp and dual_filter

Change-Id: I0ebd6951d2b42869ae872b33f63a07db03e99c62

test/convolve_test.cc

diff --git a/test/convolve_test.cc b/test/convolve_test.cc
index 3c93463..12af4fd 100644
--- a/test/convolve_test.cc
+++ b/test/convolve_test.cc
@@ -639,7 +639,7 @@
   for (int filter_bank = 0; filter_bank < kNumFilterBanks; ++filter_bank) {
     const InterpKernel *filters =
         (const InterpKernel *)av1_get_interp_filter_kernel(filter_bank);
-#if CONFIG_EXT_INTERP || CONFIG_DUAL_FILTER
+#if CONFIG_DUAL_FILTER
     const InterpFilterParams filter_params =
         av1_get_interp_filter_params(filter_bank);
     if (filter_params.taps != SUBPEL_TAPS) continue;
@@ -682,7 +682,7 @@
   for (int filter_bank = 0; filter_bank < kNumFilterBanks; ++filter_bank) {
     const InterpKernel *filters =
         (const InterpKernel *)av1_get_interp_filter_kernel(filter_bank);
-#if CONFIG_EXT_INTERP || CONFIG_DUAL_FILTER
+#if CONFIG_DUAL_FILTER
     const InterpFilterParams filter_params =
         av1_get_interp_filter_params(filter_bank);
     if (filter_params.taps != SUBPEL_TAPS) continue;
@@ -764,7 +764,7 @@
   for (int filter_bank = 0; filter_bank < kNumFilterBanks; ++filter_bank) {
     const InterpKernel *filters =
         (const InterpKernel *)av1_get_interp_filter_kernel(filter_bank);
-#if CONFIG_EXT_INTERP || CONFIG_DUAL_FILTER
+#if CONFIG_DUAL_FILTER
     const InterpFilterParams filter_params =
         av1_get_interp_filter_params(filter_bank);
     if (filter_params.taps != SUBPEL_TAPS) continue;
@@ -866,7 +866,7 @@
       for (int filter_bank = 0; filter_bank < kNumFilterBanks; ++filter_bank) {
         const InterpKernel *filters =
             (const InterpKernel *)av1_get_interp_filter_kernel(filter_bank);
-#if CONFIG_EXT_INTERP || CONFIG_DUAL_FILTER
+#if CONFIG_DUAL_FILTER
         const InterpFilterParams filter_params =
             av1_get_interp_filter_params(filter_bank);
         if (filter_params.taps != SUBPEL_TAPS) continue;