| commit | cfab447bf8d6b5a37ccfc495446edee7f804d5ea | [log] [tgz] |
|---|---|---|
| author | Yaowu Xu <yaowu@google.com> | Sun Oct 30 16:22:05 2016 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Sun Oct 30 16:22:05 2016 +0000 |
| tree | b5912fc96e66882654f2287e8609eff6ec014927 | |
| parent | eaafb17d41b1bab27085e77f3daacdeec5e636a4 [diff] | |
| parent | bc0a5bacb56cdb3bfb3eca138e2dc54d89446da2 [diff] |
Merge "Fix ec_adapt+daala_ec test failure" into nextgenv2
diff --git a/av1/encoder/segmentation.c b/av1/encoder/segmentation.c index 76c5243..1b7e011 100644 --- a/av1/encoder/segmentation.c +++ b/av1/encoder/segmentation.c
@@ -374,7 +374,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 }