[FFmpeg-cvslog] Merge commit '97aec6e75ef36ed0402653519daa8e1fc8ddb555'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Tue Apr 12 15:43:01 2016 +0100| [197fa698c6cf77b31f3e29a2f685aa52e7404b8b] | committer: Derek Buitenhuis

Merge commit '97aec6e75ef36ed0402653519daa8e1fc8ddb555'

* commit '97aec6e75ef36ed0402653519daa8e1fc8ddb555':
  fft: arm: Drop unnecessary #include, add missing ones

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=197fa698c6cf77b31f3e29a2f685aa52e7404b8b
---

 libavcodec/aarch64/fft_init_aarch64.c |    3 +++
 libavcodec/arm/fft_fixed_init_arm.c   |    2 ++
 libavcodec/arm/fft_init_arm.c         |    4 +++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/libavcodec/aarch64/fft_init_aarch64.c b/libavcodec/aarch64/fft_init_aarch64.c
index 8514d3b..db28520 100644
--- a/libavcodec/aarch64/fft_init_aarch64.c
+++ b/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);
diff --git a/libavcodec/arm/fft_fixed_init_arm.c b/libavcodec/arm/fft_fixed_init_arm.c
index b60bb9f..11226d6 100644
--- a/libavcodec/arm/fft_fixed_init_arm.c
+++ b/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
diff --git a/libavcodec/arm/fft_init_arm.c b/libavcodec/arm/fft_init_arm.c
index 055c2c1..963276f 100644
--- a/libavcodec/arm/fft_init_arm.c
+++ b/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);
 


======================================================================