pass only one arg to wma_init().
authorAndre Noll <maan@systemlinux.org>
Sat, 17 Oct 2009 19:51:57 +0000 (21:51 +0200)
committerAndre Noll <maan@systemlinux.org>
Wed, 18 Nov 2009 18:34:18 +0000 (19:34 +0100)
wmadec_filter.c

index 13ad99c..c0d770d 100644 (file)
@@ -276,13 +276,15 @@ static void compute_scale_factor_band_sizes(struct private_wmadec_data *pwd,
        }
 }
 
-static int wma_init(struct private_wmadec_data *pwd, int flags2, struct asf_header_info *ahi)
+static int wma_init(struct private_wmadec_data *pwd)
 {
        int i;
        float bps1, high_freq;
        volatile float bps;
        int sample_rate1;
        int coef_vlc_table;
+       struct asf_header_info *ahi = &pwd->ahi;
+       int flags2 = ahi->flags2;
 
        if (ahi->sample_rate <= 0 || ahi->sample_rate > 50000
                || ahi->channels <= 0 || ahi->channels > 8
@@ -474,7 +476,7 @@ static int wma_decode_init(char *initial_buf, int len, struct private_wmadec_dat
        pwd->use_bit_reservoir = pwd->ahi.flags2 & 0x0002;
        pwd->use_variable_block_len = pwd->ahi.flags2 & 0x0004;
 
-       ret = wma_init(pwd, pwd->ahi.flags2, &pwd->ahi);
+       ret = wma_init(pwd);
        if (ret < 0)
                return ret;
        /* init MDCT */