commit 59848c5c797ddb6051e88b283353c7562d3a2c24
author Alex Converse <aconverse@google.com> Mon Oct 10 14:43:10 2016 -0700
committer Alex Converse <aconverse@google.com> Mon Oct 10 14:52:12 2016 -0700
tree e37ec37830b5e18583375895be7b39a7afbbe04b
parent 9719e2d65675f212bade551c8dd18156f4fb6ed2

Fix ec_adapt+daala_ec test failure

AV1/AqSegmentTest.TestNoMisMatchAQ1/6 was failing with this experiment
pair.

BUG=aomedia:70

Change-Id: I8c53a043471a87a98a06687afce2e28891592362

av1/encoder/segmentation.c

diff --git a/av1/encoder/segmentation.c b/av1/encoder/segmentation.c
index 7d59f4c..569f4b5 100644
--- a/av1/encoder/segmentation.c
+++ b/av1/encoder/segmentation.c
@@ -276,7 +276,7 @@
   } else {
     seg->temporal_update = 0;
   }
-#if CONFIG_DAALA_EC
+#if !CONFIG_EC_ADAPT && CONFIG_DAALA_EC
   av1_tree_to_cdf(av1_segment_tree, segp->tree_probs, segp->tree_cdf);
 #endif
 }