diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-25 12:35:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-25 12:39:17 +0200 |
| commit | 937eaba2a1159225aeef694d9b2e72d9eff0c8da (patch) | |
| tree | 9380f6ad7f4112236bc295d1daed74f20aff1549 | |
| parent | 04bc37007224cfab68bc557507c449fb661218e5 (diff) | |
| parent | 060e4a9e0627adcda9101dd68ec7f22b4ce22b5b (diff) | |
| download | ffmpeg-937eaba2a1159225aeef694d9b2e72d9eff0c8da.tar.gz | |
Merge commit '060e4a9e0627adcda9101dd68ec7f22b4ce22b5b'
* commit '060e4a9e0627adcda9101dd68ec7f22b4ce22b5b':
dct/rdft: Remove duplicate typedefs for context structs
See: 005e81d6cff4071847fe6e6b6de3b5d709c76de9
See: 77304cf3523cbeec56a29749fea5c21e610be644
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/fft-test.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/fft-test.c b/libavcodec/fft-test.c index 1dbd271271..0e9f69155e 100644 --- a/libavcodec/fft-test.c +++ b/libavcodec/fft-test.c @@ -39,9 +39,11 @@ #include "libavutil/mathematics.h" #include "libavutil/time.h" -#include "dct.h" #include "fft.h" +#if FFT_FLOAT +#include "dct.h" #include "rdft.h" +#endif /* reference fft */ |