commit 7abe9db7db5daa0826a46e4eb2f420180803f277
author Jonathan Matthews <jonathan.matthews@argondesign.com> Thu Jul 27 10:31:03 2017 +0100
committer Jonathan Matthews <jonathan.matthews@argondesign.com> Fri Jul 28 07:14:27 2017 +0000
tree 62ae415d181ce0107821a9e735eadeb42aa5957f
parent 7596ee1692f63581236457b8d5c32052dc5caf6c

Adapt palette cdf

Bug introduced in change: Ic4c9333c9af5993bc41e513b9e766450b3a951eb

BUG=aomedia:667

Change-Id: I29ab87f32d2f940a3d1e079f734b92467d2ebea9

av1/common/entropy.c

diff --git a/av1/common/entropy.c b/av1/common/entropy.c
index b3d5738..d00c5c8 100644
--- a/av1/common/entropy.c
+++ b/av1/common/entropy.c
@@ -5688,13 +5688,13 @@
 #if CONFIG_VAR_TX
   AVERAGE_TILE_CDFS(txfm_partition_cdf)
 #endif
+#endif  // CONFIG_NEW_MULTISYMBOL
 #if CONFIG_PALETTE
   AVERAGE_TILE_CDFS(palette_y_size_cdf)
   AVERAGE_TILE_CDFS(palette_uv_size_cdf)
   AVERAGE_TILE_CDFS(palette_y_color_index_cdf)
   AVERAGE_TILE_CDFS(palette_uv_color_index_cdf)
 #endif
-#endif  // CONFIG_NEW_MULTISYMBOL
 }
 
 void av1_average_tile_inter_cdfs(AV1_COMMON *cm, FRAME_CONTEXT *fc,