summaryrefslogtreecommitdiff
path: root/libavcodec/wmadec.c
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2011-03-19 15:14:17 +0000
committerMans Rullgard <mans@mansr.com>2011-03-19 19:49:18 +0000
commit26f548bb59177cfc8c45ff633dd37b60cfd23edf (patch)
tree1e2f6b7d04f8554c60eb4b562844f1cf21b64b9b /libavcodec/wmadec.c
parentec10a9ab461b26b96eff7bbbb8623f42d8ee04ad (diff)
fft: remove inline wrappers for function pointers
This removes the rather pointless wrappers (one not even inline) for calling the fft_calc and related function pointers. Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'libavcodec/wmadec.c')
-rw-r--r--libavcodec/wmadec.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c
index 74fc6bab1a..f6ed26cb59 100644
--- a/libavcodec/wmadec.c
+++ b/libavcodec/wmadec.c
@@ -447,6 +447,7 @@ static int wma_decode_block(WMACodecContext *s)
int coef_nb_bits, total_gain;
int nb_coefs[MAX_CHANNELS];
float mdct_norm;
+ FFTContext *mdct;
#ifdef TRACE
tprintf(s->avctx, "***decode_block: %d:%d\n", s->frame_count - 1, s->block_num);
@@ -742,12 +743,14 @@ static int wma_decode_block(WMACodecContext *s)
}
next:
+ mdct = &s->mdct_ctx[bsize];
+
for(ch = 0; ch < s->nb_channels; ch++) {
int n4, index;
n4 = s->block_len / 2;
if(s->channel_coded[ch]){
- ff_imdct_calc(&s->mdct_ctx[bsize], s->output, s->coefs[ch]);
+ mdct->imdct_calc(mdct, s->output, s->coefs[ch]);
}else if(!(s->ms_stereo && ch==1))
memset(s->output, 0, sizeof(s->output));