Commit bc030eea authored by Zoe Liu's avatar Zoe Liu
Browse files

Fix build warnings when global_motion is off

Change-Id: I69f042e6da5a4b5e4a18853c5f15532dfef0204a
parent 9ee82650
...@@ -440,7 +440,6 @@ void av1_initialize_rd_consts(AV1_COMP *cpi) { ...@@ -440,7 +440,6 @@ void av1_initialize_rd_consts(AV1_COMP *cpi) {
AV1_COMMON *const cm = &cpi->common; AV1_COMMON *const cm = &cpi->common;
MACROBLOCK *const x = &cpi->td.mb; MACROBLOCK *const x = &cpi->td.mb;
RD_OPT *const rd = &cpi->rd; RD_OPT *const rd = &cpi->rd;
int i;
int nmv_ctx; int nmv_ctx;
aom_clear_system_state(); aom_clear_system_state();
...@@ -474,7 +473,7 @@ void av1_initialize_rd_consts(AV1_COMP *cpi) { ...@@ -474,7 +473,7 @@ void av1_initialize_rd_consts(AV1_COMP *cpi) {
if (cpi->oxcf.pass != 1) { if (cpi->oxcf.pass != 1) {
av1_fill_token_costs(x->token_costs, cm->fc->coef_probs); av1_fill_token_costs(x->token_costs, cm->fc->coef_probs);
#if CONFIG_GLOBAL_MOTION #if CONFIG_GLOBAL_MOTION
for (i = 0; i < TRANS_TYPES; ++i) for (int i = 0; i < TRANS_TYPES; ++i)
cpi->gmtype_cost[i] = (1 + (i > 0 ? GLOBAL_TYPE_BITS : 0)) cpi->gmtype_cost[i] = (1 + (i > 0 ? GLOBAL_TYPE_BITS : 0))
<< AV1_PROB_COST_SHIFT; << AV1_PROB_COST_SHIFT;
#endif // CONFIG_GLOBAL_MOTION #endif // CONFIG_GLOBAL_MOTION
......
...@@ -6084,6 +6084,7 @@ static int check_best_zero_mv( ...@@ -6084,6 +6084,7 @@ static int check_best_zero_mv(
#endif #endif
(void)mi_row; (void)mi_row;
(void)mi_col; (void)mi_col;
(void)cpi;
#if CONFIG_GLOBAL_MOTION #if CONFIG_GLOBAL_MOTION
if (this_mode == ZEROMV if (this_mode == ZEROMV
#if CONFIG_EXT_INTER #if CONFIG_EXT_INTER
......
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