Merge prediction filter
Removed the experimental flag from around the prediction filter.
Change-Id: Ic1dd2db8fe8ac17ed5129f83094d4c5cdd5527d2
diff --git a/configure b/configure
index 5506aec..cc43b97 100755
--- a/configure
+++ b/configure
@@ -239,7 +239,6 @@
EXPERIMENT_LIST="
csm
comp_intra_pred
- pred_filter
lossless
subpelrefmv
new_mvref
diff --git a/vp9/common/vp9_entropymode.h b/vp9/common/vp9_entropymode.h
index 439fb3f..01e5856 100644
--- a/vp9/common/vp9_entropymode.h
+++ b/vp9/common/vp9_entropymode.h
@@ -97,11 +97,7 @@
void vp9_adapt_mode_probs(struct VP9Common *);
-#if CONFIG_PRED_FILTER
#define VP9_SWITCHABLE_FILTERS 3 /* number of switchable filters */
-#else
-#define VP9_SWITCHABLE_FILTERS 2 /* number of switchable filters */
-#endif
extern const INTERPOLATIONFILTERTYPE vp9_switchable_interp
[VP9_SWITCHABLE_FILTERS];
diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c
index 90f3500..b767ff0 100644
--- a/vp9/encoder/vp9_onyx_if.c
+++ b/vp9/encoder/vp9_onyx_if.c
@@ -49,11 +49,7 @@
static void set_default_lf_deltas(VP9_COMP *cpi);
-#if CONFIG_PRED_FILTER
#define DEFAULT_INTERP_FILTER SWITCHABLE
-#else
-#define DEFAULT_INTERP_FILTER EIGHTTAP
-#endif
#define SEARCH_BEST_FILTER 0 /* to search exhaustively for
best filter */
