X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=wmadec_filter.c;h=0dff2b7914a0e1f1e18afc412bbd331bfe32f648;hp=6348adda2f3899d3a7ffd44d1c082a439bf4c1df;hb=33434de86d9f9c237b7bfb1204512404c42e83ff;hpb=f60abbe18364a4368fd756f48c79af67d377fca7

diff --git a/wmadec_filter.c b/wmadec_filter.c
index 6348adda..0dff2b79 100644
--- a/wmadec_filter.c
+++ b/wmadec_filter.c
@@ -429,13 +429,13 @@ static int wma_init(struct private_wmadec_data *pwd)
 	return 0;
 }
 
-static void wma_lsp_to_curve_init(struct private_wmadec_data *pwd, int frame_len)
+static void wma_lsp_to_curve_init(struct private_wmadec_data *pwd)
 {
 	float wdel, a, b;
 	int i, e, m;
 
-	wdel = M_PI / frame_len;
-	for (i = 0; i < frame_len; i++)
+	wdel = M_PI / pwd->frame_len;
+	for (i = 0; i < pwd->frame_len; i++)
 		pwd->lsp_cos_table[i] = 2.0f * cos(wdel * i);
 
 	/* tables for x^-0.25 computation */
@@ -491,7 +491,7 @@ static int wma_decode_init(char *initial_buf, int len, struct private_wmadec_dat
 			wma_scale_huffbits, wma_scale_huffcodes, 4);
 	} else {
 		PARA_INFO_LOG("using curve\n");
-		wma_lsp_to_curve_init(pwd, pwd->frame_len);
+		wma_lsp_to_curve_init(pwd);
 	}
 	*result = pwd;
 	return pwd->ahi.header_len;
@@ -810,7 +810,7 @@ static void compute_mdct_coefficients(struct private_wmadec_data *pwd,
 		}
 		/* very high freqs: noise */
 		n = pwd->block_len - pwd->coefs_end[bsize];
-		mult1 = mult * exponents[((-1 << bsize)) >> esize];
+		mult1 = mult * exponents[(-(1 << bsize)) >> esize];
 		for (i = 0; i < n; i++) {
 			*coefs++ = pwd->noise_table[pwd->noise_index] * mult1;
 			pwd->noise_index = (pwd->noise_index + 1)