Merge commit '97aec6e75ef36ed0402653519daa8e1fc8ddb555'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 12 Apr 2016 14:43:01 +0000 (15:43 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 12 Apr 2016 14:43:09 +0000 (15:43 +0100)
* commit '97aec6e75ef36ed0402653519daa8e1fc8ddb555':
  fft: arm: Drop unnecessary #include, add missing ones

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
1  2 
libavcodec/aarch64/fft_init_aarch64.c
libavcodec/arm/fft_fixed_init_arm.c
libavcodec/arm/fft_init_arm.c

Simple merge
Simple merge
Simple merge