From 7bcaac3e64c38de7112e6c05e3e7f19198cb9ae4 Mon Sep 17 00:00:00 2001
From: Adrian Grange <agrange@google.com>
Date: Mon, 14 Jan 2013 12:57:07 -0800
Subject: [PATCH] Merge prediction filter

Removed the experimental flag from around the prediction filter.

Change-Id: Ic1dd2db8fe8ac17ed5129f83094d4c5cdd5527d2
---
 configure                    | 1 -
 vp9/common/vp9_entropymode.h | 4 ----
 vp9/encoder/vp9_onyx_if.c    | 4 ----
 3 files changed, 9 deletions(-)

diff --git a/configure b/configure
index 5506aec45..cc43b9713 100755
--- a/configure
+++ b/configure
@@ -239,7 +239,6 @@ HAVE_LIST="
 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 439fb3f43..01e5856f7 100644
--- a/vp9/common/vp9_entropymode.h
+++ b/vp9/common/vp9_entropymode.h
@@ -97,11 +97,7 @@ void vp9_kf_default_bmode_probs(vp9_prob dest[VP9_KF_BINTRAMODES]
 
 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 90f350004..b767ff0b3 100644
--- a/vp9/encoder/vp9_onyx_if.c
+++ b/vp9/encoder/vp9_onyx_if.c
@@ -49,11 +49,7 @@ extern void print_tree_update_probs();
 
 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 */