Rename mdcdt.c and mdcdt.h.

[paraslash.git] / wmadec_filter.c

diff --git a/wmadec_filter.c b/wmadec_filter.c
index 8298296df3cc5fc3f42006a09abe5d0569725138..a548d04894040bb79b9d8247ad40200b58d917da 100644 (file)
--- a/wmadec_filter.c
+++ b/wmadec_filter.c
@@ -34,7 +34,7 @@
 #include "sched.h"
 #include "filter.h"
 #include "bitstream.h"
-#include "mdct.h"
+#include "imdct.h"
 #include "wma.h"
 #include "wmadata.h"
 
@@ -138,7 +138,7 @@ static int wmadec_cleanup(struct private_wmadec_data *s)
        int i;
 
        for (i = 0; i < s->nb_block_sizes; i++)
-               mdct_end(s->mdct_ctx[i]);
+               imdct_end(s->mdct_ctx[i]);
 
        if (s->use_exp_vlc)
                free_vlc(&s->exp_vlc);
@@ -464,7 +464,7 @@ static int wma_decode_init(char *initial_buf, int len, struct private_wmadec_dat
                return ret;
        /* init MDCT */
        for (i = 0; i < s->nb_block_sizes; i++) {
-               ret = mdct_init(s->frame_len_bits - i + 1, 1, &s->mdct_ctx[i]);
+               ret = imdct_init(s->frame_len_bits - i + 1, 1, &s->mdct_ctx[i]);
                if (ret < 0)
                        return ret;
        }
@@ -1286,6 +1286,8 @@ static ssize_t wmadec_convert(char *inbuffer, size_t len,
                if (ret <= 0)
                        return ret;
                fn->private_data = pwd;
+               fn->fc->channels = pwd->ahi.channels;
+               fn->fc->samplerate = pwd->ahi.sample_rate;
                return pwd->ahi.header_len;
        }
        /* skip 31 bytes */