Fix compiling issues with --enable-ec-adapt

Change-Id: I52e2c84ce43d36f78806c54b214f9e5b07c5f0f5

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index c9d651681209628c11768eb5114e73d44bc5e81c..dce5403769fd2b5c1baef3bbbd63bdff9fb925f2 100644 (file)
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -314,7 +314,7 @@ static void encode_unsigned_max(struct aom_write_bit_buffer *wb, int data,
   aom_wb_write_literal(wb, data, get_unsigned_bits(max));
 }
 
-#if !CONFIG_EC_ADAPT
+#if !CONFIG_EC_ADAPT || !CONFIG_DAALA_EC
 static void prob_diff_update(const aom_tree_index *tree,
                              aom_prob probs[/*n - 1*/],
                              const unsigned int counts[/*n - 1*/], int n,
@@ -628,7 +628,6 @@ static void update_ext_tx_probs(AV1_COMMON *cm, aom_writer *w) {
 
 #else
 #if !CONFIG_EC_ADAPT
-
 static void update_ext_tx_probs(AV1_COMMON *cm, aom_writer *w) {
   const int savings_thresh = av1_cost_one(GROUP_DIFF_UPDATE_PROB) -
                              av1_cost_zero(GROUP_DIFF_UPDATE_PROB);
@@ -2917,6 +2916,7 @@ static void write_txfm_mode(TX_MODE mode, struct aom_write_bit_buffer *wb) {
   if (mode != TX_MODE_SELECT) aom_wb_write_literal(wb, mode, 2);
 }
 
+#if !CONFIG_EC_ADAPT
 static void update_txfm_probs(AV1_COMMON *cm, aom_writer *w,
                               FRAME_COUNTS *counts) {
 #if CONFIG_TILE_GROUPS
@@ -2932,6 +2932,7 @@ static void update_txfm_probs(AV1_COMMON *cm, aom_writer *w,
                          counts->tx_size[i][j], i + 2, probwt, w);
   }
 }
+#endif
 
 static void write_interp_filter(InterpFilter filter,
                                 struct aom_write_bit_buffer *wb) {
@@ -3706,9 +3707,9 @@ static uint32_t write_compressed_header(AV1_COMP *cpi, uint8_t *data) {
 #if CONFIG_LOOP_RESTORATION
   encode_restoration(cm, header_bc);
 #endif  // CONFIG_LOOP_RESTORATION
-
+#if !CONFIG_EC_ADAPT
   update_txfm_probs(cm, header_bc, counts);
-
+#endif
   update_coef_probs(cpi, header_bc);
 
 #if CONFIG_VAR_TX