mirror of
				https://github.com/nyanmisaka/ffmpeg-rockchip.git
				synced 2025-10-26 18:30:52 +08:00 
			
		
		
		
	Merge commit '97aec6e75ef36ed0402653519daa8e1fc8ddb555'
* commit '97aec6e75ef36ed0402653519daa8e1fc8ddb555': fft: arm: Drop unnecessary #include, add missing ones Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
		| @@ -20,7 +20,10 @@ | |||||||
|  |  | ||||||
| #include "config.h" | #include "config.h" | ||||||
|  |  | ||||||
|  | #include "libavutil/attributes.h" | ||||||
|  | #include "libavutil/cpu.h" | ||||||
| #include "libavutil/aarch64/cpu.h" | #include "libavutil/aarch64/cpu.h" | ||||||
|  |  | ||||||
| #include "libavcodec/fft.h" | #include "libavcodec/fft.h" | ||||||
|  |  | ||||||
| void ff_fft_permute_neon(FFTContext *s, FFTComplex *z); | void ff_fft_permute_neon(FFTContext *s, FFTComplex *z); | ||||||
|   | |||||||
| @@ -18,6 +18,8 @@ | |||||||
|  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |  * 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 "libavutil/arm/cpu.h" | ||||||
|  |  | ||||||
| #define FFT_FLOAT 0 | #define FFT_FLOAT 0 | ||||||
|   | |||||||
| @@ -18,10 +18,12 @@ | |||||||
|  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |  * 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 "libavutil/arm/cpu.h" | ||||||
|  |  | ||||||
| #include "libavcodec/fft.h" | #include "libavcodec/fft.h" | ||||||
| #include "libavcodec/rdft.h" | #include "libavcodec/rdft.h" | ||||||
| #include "libavcodec/synth_filter.h" |  | ||||||
|  |  | ||||||
| void ff_fft_calc_vfp(FFTContext *s, FFTComplex *z); | void ff_fft_calc_vfp(FFTContext *s, FFTComplex *z); | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Derek Buitenhuis
					Derek Buitenhuis