Turn on adapt_scan by default
Change-Id: Ibf160e83e7cb1c7dce8b40e7cbead48416440974
diff --git a/configure b/configure
index 8b18399..e671ab9 100755
--- a/configure
+++ b/configure
@@ -466,6 +466,9 @@
enabled ${c} && enable_feature ${c##*_}s
done
+ # Enable adapt_scan by default
+ soft_enable adapt_scan
+
# Enable ref_mv by default
soft_enable ref_mv
diff --git a/test/av1_inv_txfm_test.cc b/test/av1_inv_txfm_test.cc
index 8f6c868..f5b33d2 100644
--- a/test/av1_inv_txfm_test.cc
+++ b/test/av1_inv_txfm_test.cc
@@ -114,7 +114,9 @@
typedef void (*InvTxfmFunc)(const tran_low_t *in, uint8_t *out, int stride);
typedef std::tr1::tuple<FwdTxfmFunc, InvTxfmFunc, InvTxfmFunc, TX_SIZE, int>
PartialInvTxfmParam;
+#if !CONFIG_ADAPT_SCAN
const int kMaxNumCoeffs = 1024;
+#endif
class AV1PartialIDctTest
: public ::testing::TestWithParam<PartialInvTxfmParam> {
public:
