diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-03 02:28:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-03 02:28:01 +0200 |
| commit | f35439699f5546774b840ae9fba7df82729ef0ff (patch) | |
| tree | 92c22313b8eda656421372955598d647aa64242e /libavcodec/fft.c | |
| parent | 85c9365d65c4d03c468cead13f722ddce89d8495 (diff) | |
| parent | bc154882e11f4a218cc8cfb10ae0b4cbc83b5f9f (diff) | |
Merge remote branch 'qatar/master'
* qatar/master:
Fixed-point MDCT with 32-bit unscaled output
lavc: deprecate rate_emu
lavc: mark hurry_up for removal on next major bump
parser: mark av_parser_parse() for removal on next major bump
lavc: add missing audioconvert includes
jvdec: don't use deprecated CODEC_TYPE_*/PKT_FLAG_KEY
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/fft.c')
| -rw-r--r-- | libavcodec/fft.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/fft.c b/libavcodec/fft.c index d12d9f7f99..c8f74a2d89 100644 --- a/libavcodec/fft.c +++ b/libavcodec/fft.c @@ -123,6 +123,9 @@ av_cold int ff_fft_init(FFTContext *s, int nbits, int inverse) if (ARCH_ARM) ff_fft_init_arm(s); if (HAVE_ALTIVEC) ff_fft_init_altivec(s); if (HAVE_MMX) ff_fft_init_mmx(s); + if (CONFIG_MDCT) s->mdct_calcw = s->mdct_calc; +#else + if (CONFIG_MDCT) s->mdct_calcw = ff_mdct_calcw_c; #endif for(j=4; j<=nbits; j++) { |