diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-21 03:09:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-21 03:33:28 +0100 |
| commit | d4a50a2100a2b3539d238e64af98e16f47b47a89 (patch) | |
| tree | 95bc08782f34783dfac34a73142a77adbce4db32 /libavcodec/wmadec.c | |
| parent | 849f80fecbada7c512737e13edec9516541996e3 (diff) | |
| parent | cf752d027fafe691951fa00d9c25e2fda032b536 (diff) | |
| download | ffmpeg-d4a50a2100a2b3539d238e64af98e16f47b47a89.tar.gz | |
Merge remote-tracking branch 'newdev/master'
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wmadec.c')
| -rw-r--r-- | libavcodec/wmadec.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c index 83f8dea8bb..5382999cb0 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)); |