From bfd62cdaff72e37fc688864cfc77f35e0375a390 Mon Sep 17 00:00:00 2001 From: Johann Date: Tue, 31 Jan 2017 15:35:20 -0800 Subject: [PATCH] vp9_rdopt: declare 'c' closer to use Clears up static clang analysis warning regarding a dead store. Only declare 'c' when it will be used. Change-Id: I1ac0fc7f94bc44da63938c63cd1efcd6b95e0eb3 --- vp9/encoder/vp9_rdopt.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index ffacc0fa2..b256c2e48 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -358,7 +358,7 @@ static int cost_coeffs(MACROBLOCK *x, int plane, int block, TX_SIZE tx_size, unsigned int(*token_costs)[2][COEFF_CONTEXTS][ENTROPY_TOKENS] = x->token_costs[tx_size][type][is_inter_block(mi)]; uint8_t token_cache[32 * 32]; - int c, cost; + int cost; #if CONFIG_VP9_HIGHBITDEPTH const int *cat6_high_cost = vp9_get_high_cost_table(xd->bd); #else @@ -373,10 +373,10 @@ static int cost_coeffs(MACROBLOCK *x, int plane, int block, TX_SIZE tx_size, if (eob == 0) { // single eob token cost = token_costs[0][0][pt][EOB_TOKEN]; - c = 0; } else { if (use_fast_coef_costing) { int band_left = *band_count++; + int c; // dc token int v = qcoeff[0]; @@ -407,6 +407,7 @@ static int cost_coeffs(MACROBLOCK *x, int plane, int block, TX_SIZE tx_size, } else { // !use_fast_coef_costing int band_left = *band_count++; + int c; // dc token int v = qcoeff[0]; -- 2.40.0