Merge commit '060e4a9e0627adcda9101dd68ec7f22b4ce22b5b'

* commit '060e4a9e0627adcda9101dd68ec7f22b4ce22b5b': dct/rdft: Remove duplicate typedefs for context structs See: 005e81d6cf See: 77304cf352 Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · 937eaba2a1
parent 04bc370072 060e4a9e06
commit 937eaba2a1
1 changed files with 3 additions and 1 deletions
--- 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 */