commit 31296067661d0c1fcfe2a96f1f155bc650cc1a9b
author Nathan E. Egge <negge@mozilla.com> Wed Nov 16 09:44:26 2016 -0500
committer Nathan Egge <negge@mozilla.com> Fri Dec 16 21:30:50 2016 +0000
tree f3a02afecd77a4fa875edeea4429736f50590f74
parent 136cfe46148346d7c7f763eebaeb3f6a6b6923bf

Use segment tree_cdf with CONFIG_EC_MULTISYMBOL.

Change-Id: I0005c896a243275c052a0163a5da0f9230071743

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 9a30e11..546bbf8 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -913,7 +913,7 @@
 static void write_segment_id(aom_writer *w, const struct segmentation *seg,
                              struct segmentation_probs *segp, int segment_id) {
   if (seg->enabled && seg->update_map) {
-#if CONFIG_DAALA_EC
+#if CONFIG_EC_MULTISYMBOL
     aom_write_symbol(w, segment_id, segp->tree_cdf, MAX_SEGMENTS);
 #else
     aom_write_tree(w, av1_segment_tree, segp->tree_probs, segment_id, 3, 0);
@@ -4351,7 +4351,7 @@
 #else
   av1_set_mv_cdfs(&fc->nmvc);
 #endif
-#if CONFIG_DAALA_EC
+#if CONFIG_EC_MULTISYMBOL
   av1_set_mode_cdfs(cm);
 #endif
 #endif