commit a59b23dd4aa9778f731863fcc1b1444395902a6c
author Nathan E. Egge <negge@mozilla.com> Wed Nov 16 09:44:26 2016 -0500
committer Nathan Egge <negge@mozilla.com> Thu Jan 05 08:26:14 2017 +0000
tree 0542f389564302cb4563157d3bad4e428a0769db
parent 00b3331ee8db2bbb015ff54a76fe28cb53617802

Use inter_mode_cdf with CONFIG_EC_MULTISYMBOL.

Change-Id: I1cf27d2f029c1e985cafb468f60e7117d92593f5

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 896e6d7..f0244bb 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -197,6 +197,8 @@
 #if CONFIG_DAALA_EC
   av1_indices_from_tree(av1_intra_mode_ind, av1_intra_mode_inv, INTRA_MODES,
                         av1_intra_mode_tree);
+#endif
+#if CONFIG_EC_MULTISYMBOL
   av1_indices_from_tree(av1_inter_mode_ind, av1_inter_mode_inv, INTER_MODES,
                         av1_inter_mode_tree);
 #endif
@@ -262,7 +264,7 @@
   }
 #else
   assert(is_inter_mode(mode));
-#if CONFIG_DAALA_EC
+#if CONFIG_EC_MULTISYMBOL
   aom_write_symbol(w, av1_inter_mode_ind[INTER_OFFSET(mode)],
                    cm->fc->inter_mode_cdf[mode_ctx], INTER_MODES);
 #else