From: Andre Noll <maan@systemlinux.org>
Date: Mon, 15 Aug 2011 17:42:15 +0000 (+0200)
Subject: wmadec: Fix two dead stores.
X-Git-Tag: v0.4.9~18^2~4
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=7321c2e7aad44b741be702de0a2ef73222be0d08;ds=sidebyside

wmadec: Fix two dead stores.

wmadec_filter.c:772:3: warning: Value stored to 'mult1' is never read
                mult1 = mult;
                ^       ~~~~
wmadec_filter.c:1015:3: warning: Value stored to 'n' is never read
                n = pwd->block_len;
                ^   ~~~~~~~~~~~~~~

Also convert a statement of the form x = x * y to x *= y;
---

diff --git a/wmadec_filter.c b/wmadec_filter.c
index 0b381c5d..c6eb0b1c 100644
--- a/wmadec_filter.c
+++ b/wmadec_filter.c
@@ -769,7 +769,6 @@ static void compute_mdct_coefficients(struct private_wmadec_data *pwd,
 				*coefs++ = 0.0;
 			continue;
 		}
-		mult1 = mult;
 		n1 = pwd->exponent_high_sizes[bsize];
 		/* compute power of high bands */
 		exponents = pwd->exponents[ch] +
@@ -803,8 +802,7 @@ static void compute_mdct_coefficients(struct private_wmadec_data *pwd,
 				mult1 = sqrt(exp_power[j]
 					/ exp_power[last_high_band]);
 				/* XXX: use a table */
-				mult1 = mult1 * pow(10,
-					pwd->high_band_values[ch][j] * 0.05);
+				mult1 *= pow(10, pwd->high_band_values[ch][j] * 0.05);
 				mult1 /= (pwd->max_exponent[ch] * pwd->noise_mult);
 				mult1 *= mdct_norm;
 				for (i = 0; i < n; i++) {
@@ -1012,7 +1010,6 @@ next:
 	for (ch = 0; ch < pwd->ahi.channels; ch++) {
 		int n4, idx;
 
-		n = pwd->block_len;
 		n4 = pwd->block_len / 2;
 		if (pwd->channel_coded[ch])
 			imdct(pwd->mdct_ctx[bsize], pwd->output, pwd->coefs[ch]);