Commit e2e591c7 authored by Sarah Parker's avatar Sarah Parker Committed by Thomas Davies
Browse files

Fix compile warnings for ext-tx + ec-adapt

Change-Id: If45e46d6459cddecca3d11b64fc73ff26c291a13
parent 1511ea10
...@@ -354,7 +354,7 @@ static void prob_diff_update(const aom_tree_index *tree, ...@@ -354,7 +354,7 @@ static void prob_diff_update(const aom_tree_index *tree,
} }
#endif #endif
#if CONFIG_EXT_INTER || CONFIG_EXT_TX || !CONFIG_EC_ADAPT #if CONFIG_EXT_INTER || !CONFIG_EC_ADAPT
static int prob_diff_update_savings(const aom_tree_index *tree, static int prob_diff_update_savings(const aom_tree_index *tree,
aom_prob probs[/*n - 1*/], aom_prob probs[/*n - 1*/],
const unsigned int counts[/*n - 1*/], int n, const unsigned int counts[/*n - 1*/], int n,
...@@ -372,7 +372,7 @@ static int prob_diff_update_savings(const aom_tree_index *tree, ...@@ -372,7 +372,7 @@ static int prob_diff_update_savings(const aom_tree_index *tree,
} }
return savings; return savings;
} }
#endif // CONFIG_EXT_INTER || CONFIG_EXT_TX || !CONFIG_EC_ADAPT #endif // CONFIG_EXT_INTER || !CONFIG_EC_ADAPT
#if CONFIG_VAR_TX #if CONFIG_VAR_TX
static void write_tx_size_vartx(const AV1_COMMON *cm, const MACROBLOCKD *xd, static void write_tx_size_vartx(const AV1_COMMON *cm, const MACROBLOCKD *xd,
...@@ -641,6 +641,7 @@ static void update_switchable_interp_probs(AV1_COMMON *cm, aom_writer *w, ...@@ -641,6 +641,7 @@ static void update_switchable_interp_probs(AV1_COMMON *cm, aom_writer *w,
} }
#endif #endif
#if !CONFIG_EC_ADAPT
#if CONFIG_EXT_TX #if CONFIG_EXT_TX
static void update_ext_tx_probs(AV1_COMMON *cm, aom_writer *w) { static void update_ext_tx_probs(AV1_COMMON *cm, aom_writer *w) {
const int savings_thresh = av1_cost_one(GROUP_DIFF_UPDATE_PROB) - const int savings_thresh = av1_cost_one(GROUP_DIFF_UPDATE_PROB) -
...@@ -702,7 +703,6 @@ static void update_ext_tx_probs(AV1_COMMON *cm, aom_writer *w) { ...@@ -702,7 +703,6 @@ static void update_ext_tx_probs(AV1_COMMON *cm, aom_writer *w) {
} }
#else #else
#if !CONFIG_EC_ADAPT
static void update_ext_tx_probs(AV1_COMMON *cm, aom_writer *w) { static void update_ext_tx_probs(AV1_COMMON *cm, aom_writer *w) {
const int savings_thresh = av1_cost_one(GROUP_DIFF_UPDATE_PROB) - const int savings_thresh = av1_cost_one(GROUP_DIFF_UPDATE_PROB) -
av1_cost_zero(GROUP_DIFF_UPDATE_PROB); av1_cost_zero(GROUP_DIFF_UPDATE_PROB);
...@@ -748,7 +748,7 @@ static void update_ext_tx_probs(AV1_COMMON *cm, aom_writer *w) { ...@@ -748,7 +748,7 @@ static void update_ext_tx_probs(AV1_COMMON *cm, aom_writer *w) {
} }
} }
#endif // CONFIG_EXT_TX #endif // CONFIG_EXT_TX
#endif #endif // !CONFIG_EC_ADAPT
#if CONFIG_PALETTE #if CONFIG_PALETTE
static void pack_palette_tokens(aom_writer *w, const TOKENEXTRA **tp, int n, static void pack_palette_tokens(aom_writer *w, const TOKENEXTRA **tp, int n,
int num) { int num) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment