diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-21 19:15:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-21 19:26:01 +0100 |
| commit | 6a7980e2cd4ba094756215df9172aad87cb1c469 (patch) | |
| tree | 91c874731ae44848e7c1f85317e3c30fc322eb75 /libavcodec/mdct_fixed.c | |
| parent | c0caf7e81493f5d9d4acd013892b651ab39be450 (diff) | |
| parent | ac0e03bab00182f845cd02d458f404ee30ef0998 (diff) | |
| download | ffmpeg-6a7980e2cd4ba094756215df9172aad87cb1c469.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dct/fft: Give consistent names to fixed/float template files
Conflicts:
libavcodec/fft_fixed.c
libavcodec/fft_float.c
libavcodec/mdct_fixed.c
libavcodec/mdct_float.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mdct_fixed.c')
| -rw-r--r-- | libavcodec/mdct_fixed.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mdct_fixed.c b/libavcodec/mdct_fixed.c index 33a266d8cb..2ee29b609a 100644 --- a/libavcodec/mdct_fixed.c +++ b/libavcodec/mdct_fixed.c @@ -18,7 +18,7 @@ #define CONFIG_FFT_FLOAT 0 #define CONFIG_FFT_FIXED_32 0 -#include "mdct.c" +#include "mdct_template.c" /* same as ff_mdct_calcw_c with double-width unscaled output */ void ff_mdct_calcw_c(FFTContext *s, FFTDouble *out, const FFTSample *input) |