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/vorbis_enc.c | |
parent | 849f80fecbada7c512737e13edec9516541996e3 (diff) | |
parent | cf752d027fafe691951fa00d9c25e2fda032b536 (diff) | |
download | ffmpeg-streaming-d4a50a2100a2b3539d238e64af98e16f47b47a89.zip ffmpeg-streaming-d4a50a2100a2b3539d238e64af98e16f47b47a89.tar.gz |
Merge remote-tracking branch 'newdev/master'
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vorbis_enc.c')
-rw-r--r-- | libavcodec/vorbis_enc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vorbis_enc.c b/libavcodec/vorbis_enc.c index 93683ac..7dae4cb 100644 --- a/libavcodec/vorbis_enc.c +++ b/libavcodec/vorbis_enc.c @@ -935,7 +935,7 @@ static int apply_window_and_mdct(vorbis_enc_context *venc, const signed short *a } for (channel = 0; channel < venc->channels; channel++) - ff_mdct_calc(&venc->mdct[0], venc->coeffs + channel * window_len, + venc->mdct[0].mdct_calc(&venc->mdct[0], venc->coeffs + channel * window_len, venc->samples + channel * window_len * 2); if (samples) { |