Merge "Fix ec_adapt+daala_ec test failure" into nextgenv2

2016-10-30 16:22:05 +00:00
parent eaafb17d41 bc0a5bacb5
commit cfab447bf8
1 changed files with 1 additions and 1 deletions
--- a/av1/encoder/segmentation.c
+++ b/av1/encoder/segmentation.c
@@ -374,7 +374,7 @@ void av1_choose_segmap_coding_method(AV1_COMMON *cm, MACROBLOCKD *xd) {
  } 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
 }