Change name of private_wmadec_data parameter of wmadec_cleanup().

[paraslash.git] / wmadec_filter.c

diff --git a/wmadec_filter.c b/wmadec_filter.c
index 0565a14bfaac6e0353fd5eac89b23666c03a1282..a51ca5eac4467e4c4856bc2cfed74c91a07484de 100644 (file)
--- a/wmadec_filter.c
+++ b/wmadec_filter.c
@@ -9,7 +9,7 @@
  * For licencing details see COPYING.LIB.
  */
 
-/** * \file wmadec_filter.c paraslash's WMA decoder.  */
+/** \file wmadec_filter.c paraslash's WMA decoder. */
 
 /*
  * This decoder handles Microsoft Windows Media Audio data version 2.
@@ -129,7 +129,7 @@ struct private_wmadec_data {
 #define HGAINMAX ((13 + HGAINVLCBITS - 1) / HGAINVLCBITS)
 
 #define VLCBITS 9
-#define VLCMAX ((22 + VLCBITS - 1)/VLCBITS)
+#define VLCMAX ((22 + VLCBITS - 1) / VLCBITS)
 
 DECLARE_ALIGNED(16, float, ff_sine_128[128]);
 DECLARE_ALIGNED(16, float, ff_sine_256[256]);
@@ -152,24 +152,22 @@ static void sine_window_init(float *window, int n)
                window[i] = sinf((i + 0.5) * (M_PI / (2.0 * n)));
 }
 
-static int wmadec_cleanup(struct private_wmadec_data *s)
+static void wmadec_cleanup(struct private_wmadec_data *pwd)
 {
        int i;
 
-       for (i = 0; i < s->nb_block_sizes; i++)
-               imdct_end(s->mdct_ctx[i]);
-
-       if (s->use_exp_vlc)
-               free_vlc(&s->exp_vlc);
-       if (s->use_noise_coding)
-               free_vlc(&s->hgain_vlc);
+       for (i = 0; i < pwd->nb_block_sizes; i++)
+               imdct_end(pwd->mdct_ctx[i]);
+       if (pwd->use_exp_vlc)
+               free_vlc(&pwd->exp_vlc);
+       if (pwd->use_noise_coding)
+               free_vlc(&pwd->hgain_vlc);
        for (i = 0; i < 2; i++) {
-               free_vlc(&s->coef_vlc[i]);
-               free(s->run_table[i]);
-               free(s->level_table[i]);
-               free(s->int_table[i]);
+               free_vlc(&pwd->coef_vlc[i]);
+               free(pwd->run_table[i]);
+               free(pwd->level_table[i]);
+               free(pwd->int_table[i]);
        }
-       return 0;
 }
 
 /* XXX: use same run/length optimization as mpeg decoders */
@@ -309,9 +307,8 @@ static int wma_init(struct private_wmadec_data *s, int flags2, struct asf_header
                if (nb > nb_max)
                        nb = nb_max;
                s->nb_block_sizes = nb + 1;
-       } else {
+       } else
                s->nb_block_sizes = 1;
-       }
 
        /* init rate dependent parameters */
        s->use_noise_coding = 1;