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/nellymoserenc.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/nellymoserenc.c')
| -rw-r--r-- | libavcodec/nellymoserenc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/nellymoserenc.c b/libavcodec/nellymoserenc.c index 9b792ff2ac..81a1d43e4e 100644 --- a/libavcodec/nellymoserenc.c +++ b/libavcodec/nellymoserenc.c @@ -39,6 +39,7 @@ #include "avcodec.h" #include "dsputil.h" #include "fft.h" +#include "sinewin.h" #define BITSTREAM_WRITER_LE #include "put_bits.h" @@ -116,13 +117,13 @@ static void apply_mdct(NellyMoserEncodeContext *s) s->dsp.vector_fmul(s->in_buff, s->buf[s->bufsel], ff_sine_128, NELLY_BUF_LEN); s->dsp.vector_fmul_reverse(s->in_buff + NELLY_BUF_LEN, s->buf[s->bufsel] + NELLY_BUF_LEN, ff_sine_128, NELLY_BUF_LEN); - ff_mdct_calc(&s->mdct_ctx, s->mdct_out, s->in_buff); + s->mdct_ctx.mdct_calc(&s->mdct_ctx, s->mdct_out, s->in_buff); s->dsp.vector_fmul(s->buf[s->bufsel] + NELLY_BUF_LEN, s->buf[s->bufsel] + NELLY_BUF_LEN, ff_sine_128, NELLY_BUF_LEN); s->dsp.vector_fmul_reverse(s->buf[s->bufsel] + 2 * NELLY_BUF_LEN, s->buf[1 - s->bufsel], ff_sine_128, NELLY_BUF_LEN); - ff_mdct_calc(&s->mdct_ctx, s->mdct_out + NELLY_BUF_LEN, s->buf[s->bufsel] + NELLY_BUF_LEN); + s->mdct_ctx.mdct_calc(&s->mdct_ctx, s->mdct_out + NELLY_BUF_LEN, s->buf[s->bufsel] + NELLY_BUF_LEN); } static av_cold int encode_init(AVCodecContext *avctx) |