Merge remote-tracking branch 'newdev/master'

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-21 03:09:46 +01:00
parent 849f80fecb cf752d027f
commit d4a50a2100
44 changed files with 458 additions and 275 deletions
--- a/libavcodec/arm/fft_init_arm.c
+++ b/libavcodec/arm/fft_init_arm.c
@@ -19,6 +19,7 @@
 */

 #include "libavcodec/fft.h"
+#include "libavcodec/rdft.h"
 #include "libavcodec/synth_filter.h"

 void ff_fft_permute_neon(FFTContext *s, FFTComplex *z);