commit 77ea41c35567ae17e6bd257d05ba724d4d414e07
author Nathan E. Egge <negge@mozilla.com> Wed Oct 04 15:28:22 2017 -0400
committer Sebastien Alaiwan <sebastien.alaiwan@allegrodvt.com> Tue Oct 17 16:51:27 2017 +0000
tree 3da8ba67d42dc1ba600f2e0c02f1d50226d99d09
parent d8b93f56139e4f4e3b17dd2d21607dd9b630caa7

Disable txmg when using daala transforms.

Change-Id: Ib38368d0aa7e13e53e8040c75a8564fbdb7646c7

build/cmake/aom_experiment_deps.cmake

diff --git a/build/cmake/aom_experiment_deps.cmake b/build/cmake/aom_experiment_deps.cmake
index 152bbc7..d7a0b27 100644
--- a/build/cmake/aom_experiment_deps.cmake
+++ b/build/cmake/aom_experiment_deps.cmake
@@ -41,6 +41,9 @@
 
   if (CONFIG_DAALA_DCT4 OR CONFIG_DAALA_DCT8 OR CONFIG_DAALA_DCT16 OR
       CONFIG_DAALA_DCT32 OR CONFIG_DAALA_DCT64)
+    if (CONFIG_TXMG)
+      change_config_and_warn(CONFIG_TXMG 0 CONFIG_DAALA_DCTx)
+    endif ()
     if (CONFIG_LGT)
       change_config_and_warn(CONFIG_LGT 0 CONFIG_DAALA_DCTx)
     endif ()

configure

diff --git a/configure b/configure
index 009de46..7ecc0ca 100755
--- a/configure
+++ b/configure
@@ -603,6 +603,7 @@
     fi
     if enabled daala_dct4 || enabled daala_dct8 || enabled daala_dct16 ||
         enabled daala_dct32 || enabled daala_dct64; then
+      disable_feature txmg
       disable_feature lgt
       enable_feature lowbitdepth
     fi