X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=wmadec_filter.c;h=16b9894ca5420bf226731d6330a5d21121ccbcdc;hb=21de835df6d0762c8d7b6dab439257e7fe8a70e6;hp=d40cc3eb201d808be4d98e4665038e86f221ff70;hpb=6e3e6ad58782bbd5b6249700e6c52fc8e2a16809;p=paraslash.git

diff --git a/wmadec_filter.c b/wmadec_filter.c
index d40cc3eb..16b9894c 100644
--- a/wmadec_filter.c
+++ b/wmadec_filter.c
@@ -131,7 +131,7 @@ struct private_wmadec_data {
 #define VLCBITS 9
 #define VLCMAX ((22 + VLCBITS - 1) / VLCBITS)
 
-#define SINE_WINDOW(x) float ff_sine_ ## x[x] __aligned(16)
+#define SINE_WINDOW(x) float sine_ ## x[x] __aligned(16)
 
 SINE_WINDOW(128);
 SINE_WINDOW(256);
@@ -140,9 +140,8 @@ SINE_WINDOW(1024);
 SINE_WINDOW(2048);
 SINE_WINDOW(4096);
 
-static float *ff_sine_windows[6] = {
-	ff_sine_128, ff_sine_256, ff_sine_512, ff_sine_1024,
-	ff_sine_2048, ff_sine_4096
+static float *sine_windows[6] = {
+	sine_128, sine_256, sine_512, sine_1024, sine_2048, sine_4096
 };
 
 /* Generate a sine window. */
@@ -385,8 +384,8 @@ static int wma_init(struct private_wmadec_data *pwd)
 	for (i = 0; i < pwd->nb_block_sizes; i++) {
 		int n;
 		n = 1 << (pwd->frame_len_bits - i);
-		sine_window_init(ff_sine_windows[pwd->frame_len_bits - i - 7], n);
-		pwd->windows[i] = ff_sine_windows[pwd->frame_len_bits - i - 7];
+		sine_window_init(sine_windows[pwd->frame_len_bits - i - 7], n);
+		pwd->windows[i] = sine_windows[pwd->frame_len_bits - i - 7];
 	}
 
 	pwd->reset_block_lengths = 1;
@@ -483,15 +482,15 @@ static int wma_decode_init(char *initial_buf, int len, struct private_wmadec_dat
 	if (pwd->use_noise_coding) {
 		PARA_INFO_LOG("using noise coding\n");
 		init_vlc(&pwd->hgain_vlc, HGAINVLCBITS,
-			sizeof(ff_wma_hgain_huffbits), ff_wma_hgain_huffbits,
-			ff_wma_hgain_huffcodes, 2);
+			sizeof(wma_hgain_huffbits), wma_hgain_huffbits,
+			wma_hgain_huffcodes, 2);
 	}
 
 	if (pwd->use_exp_vlc) {
 		PARA_INFO_LOG("using exp_vlc\n");
 		init_vlc(&pwd->exp_vlc, EXPVLCBITS,
-		sizeof(ff_wma_scale_huffbits), ff_wma_scale_huffbits,
-		ff_wma_scale_huffcodes, 4);
+		sizeof(wma_scale_huffbits), wma_scale_huffbits,
+		wma_scale_huffcodes, 4);
 	} else {
 		PARA_INFO_LOG("using curve\n");
 		wma_lsp_to_curve_init(pwd, pwd->frame_len);
@@ -562,7 +561,7 @@ static void decode_exp_lsp(struct private_wmadec_data *pwd, int ch)
 			val = get_bits(&pwd->gb, 3);
 		else
 			val = get_bits(&pwd->gb, 4);
-		lsp_coefs[i] = ff_wma_lsp_codebook[i][val];
+		lsp_coefs[i] = wma_lsp_codebook[i][val];
 	}
 
 	wma_lsp_to_curve(pwd, pwd->exponents[ch], &pwd->max_exponent[ch],