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/common/blockd.h

diff --git a/av1/common/blockd.h b/av1/common/blockd.h
index a541378..b16f512 100644
--- a/av1/common/blockd.h
+++ b/av1/common/blockd.h
@@ -155,6 +155,7 @@
 
 typedef int8_t MV_REFERENCE_FRAME;
 
+#if CONFIG_PALETTE
 typedef struct {
   // Number of base colors for Y (0) and UV (1)
   uint8_t palette_size[2];
@@ -168,6 +169,7 @@
   // TODO(huisu): move this to encoder
   uint8_t palette_first_color_idx[2];
 } PALETTE_MODE_INFO;
+#endif  // CONFIG_PALETTE
 
 #if CONFIG_EXT_INTRA
 typedef struct {
@@ -199,7 +201,9 @@
 
   // Only for INTRA blocks
   PREDICTION_MODE uv_mode;
+#if CONFIG_PALETTE
   PALETTE_MODE_INFO palette_mode_info;
+#endif  // CONFIG_PALETTE
 
 // Only for INTER blocks
 #if CONFIG_DUAL_FILTER
@@ -291,7 +295,9 @@
   dequant_val_type_nuq seg_dequant_nuq[MAX_SEGMENTS][QUANT_PROFILES]
                                       [COEF_BANDS];
 #endif
+#if CONFIG_PALETTE
   uint8_t *color_index_map;
+#endif  // CONFIG_PALETTE
 
   // number of 4x4s in current block
   uint16_t n4_w, n4_h;