Merge commit '97aec6e7'

* commit '97aec6e7':
  fft: arm: Drop unnecessary #include, add missing ones
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

libavcodec/aarch64/fft_init_aarch64.c

@@ -20,7 +20,10 @@
 
 #include "config.h"
 
+#include "libavutil/attributes.h"
+#include "libavutil/cpu.h"
 #include "libavutil/aarch64/cpu.h"
+
 #include "libavcodec/fft.h"
 
 void ff_fft_permute_neon(FFTContext *s, FFTComplex *z);

libavcodec/arm/fft_fixed_init_arm.c

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/attributes.h"
+#include "libavutil/cpu.h"
 #include "libavutil/arm/cpu.h"
 
 #define FFT_FLOAT 0

libavcodec/arm/fft_init_arm.c

@@ -18,10 +18,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/attributes.h"
+#include "libavutil/cpu.h"
 #include "libavutil/arm/cpu.h"
+
 #include "libavcodec/fft.h"
 #include "libavcodec/rdft.h"
-#include "libavcodec/synth_filter.h"
 
 void ff_fft_calc_vfp(FFTContext *s, FFTComplex *z);