commit b100db7c1d26c921c233c671e496120b8c39e169
author Urvang Joshi <urvang@google.com> Wed Oct 12 16:28:56 2016 -0700
committer Urvang Joshi <urvang@google.com> Fri Oct 14 13:42:02 2016 -0700
tree 1497d72c919954455d0b37315400be49a21e0aeb
parent fbabcad67c1b277608b6bee26816d9b4746d7a88

Wrap palette code inside CONFIG_PALETTE flag.

This flag was already added to aomedia/master, so bringing it back to
webm/nextgenv2, as part of an effort to get the two codebases in sync.

Change-Id: I2b933a6a160e4210d1411a9e7978149eb8553205

av1/encoder/rd.c

diff --git a/av1/encoder/rd.c b/av1/encoder/rd.c
index ff96714..2b9171f 100644
--- a/av1/encoder/rd.c
+++ b/av1/encoder/rd.c
@@ -90,6 +90,7 @@
     av1_cost_tokens(cpi->switchable_interp_costs[i],
                     fc->switchable_interp_prob[i], av1_switchable_interp_tree);
 
+#if CONFIG_PALETTE
   for (i = 0; i < PALETTE_BLOCK_SIZES; ++i) {
     av1_cost_tokens(cpi->palette_y_size_cost[i],
                     av1_default_palette_y_size_prob[i], av1_palette_size_tree);
@@ -97,7 +98,7 @@
                     av1_default_palette_uv_size_prob[i], av1_palette_size_tree);
   }
 
-  for (i = 0; i < PALETTE_MAX_SIZE - 1; ++i)
+  for (i = 0; i < PALETTE_MAX_SIZE - 1; ++i) {
     for (j = 0; j < PALETTE_COLOR_CONTEXTS; ++j) {
       av1_cost_tokens(cpi->palette_y_color_cost[i][j],
                       av1_default_palette_y_color_prob[i][j],
@@ -106,6 +107,8 @@
                       av1_default_palette_uv_color_prob[i][j],
                       av1_palette_color_tree[i]);
     }
+  }
+#endif  // CONFIG_PALETTE
 
   for (i = 0; i < TX_SIZES - 1; ++i)
     for (j = 0; j < TX_SIZE_CONTEXTS; ++j)