commit 72e0f78312c74ba67c88900429d208056f6607f3
author Nathan E. Egge <negge@mozilla.com> Wed Sep 13 12:01:26 2017 -0400
committer Nathan Egge <negge@mozilla.com> Fri Sep 15 18:34:18 2017 +0000
tree 6dc2ff4936857b6ab5fdf7aeb440acfaf19bd09b
parent 71b0513bf50978e9de5418ebea30a706ac5b8b6b

Disable daala_dct64 if tx64x64 is not enabled.

Change-Id: Ib19d9431124b2416abe4a217138ec8bdb029f73c

build/cmake/aom_configure.cmake

diff --git a/build/cmake/aom_configure.cmake b/build/cmake/aom_configure.cmake
index 04c112b..69602a5 100644
--- a/build/cmake/aom_configure.cmake
+++ b/build/cmake/aom_configure.cmake
@@ -164,10 +164,9 @@
    change_config_and_warn(CONFIG_VAR_TX 1 CONFIG_VAR_TX_NO_TX_MODE)
 endif()
 
-if (CONFIG_DAALA_DCT64)
-  if (NOT CONFIG_TX64X64)
-    change_config_and_warn(CONFIG_TX64X64 1 CONFIG_DAALA_DCT64)
-   endif()
+if (CONFIG_DAALA_DCT64 AND NOT CONFIG_TX64X64)
+   message(WARNING "--- CONFIG_DAALA_DCT64 requires CONFIG_TX64X64, disabling.")
+   set(CONFIG_DAALA_DCT64 0)
 endif()
 
 if (CONFIG_DAALA_DCT4 OR CONFIG_DAALA_DCT8 OR CONFIG_DAALA_DCT16 OR

configure

diff --git a/configure b/configure
index b75cbd7..abe31b8 100755
--- a/configure
+++ b/configure
@@ -568,8 +568,9 @@
       log_echo "rawbits requires not ans, so disabling rawbits"
       disable_feature rawbits
     fi
-    if enabled daala_dct64; then
-      enable_feature tx64x64
+    if enabled daala_dct64 && ! enabled tx64x64; then
+      log_echo "daala_dct64 requires tx64x64, so disabling daala_dct64"
+      disable_feature daala_dct64
     fi
     if enabled daala_dct4 ||
 	    enabled daala_dct8 ||