| author | Tellen Yu <tellen.yu@amlogic.com> | 2016-08-30 10:43:05 (GMT) |
|---|---|---|
| committer | Tellen Yu <tellen.yu@amlogic.com> | 2016-08-30 10:46:42 (GMT) |
| commit | ce2856e687355620f2c9193584b6cf3c89073837 (patch) | |
| tree | c01063e95c8d29e751cbbe53db129614a41a0089 | |
| parent | 275dee1cfd4d40b121ef4c74629db38d7498e9df (diff) | |
| download | ffmpeg-ce2856e687355620f2c9193584b6cf3c89073837.zip ffmpeg-ce2856e687355620f2c9193584b6cf3c89073837.tar.gz ffmpeg-ce2856e687355620f2c9193584b6cf3c89073837.tar.bz2 | |
modify for Nougat bringup
Change-Id: I3283aaa3305e8a06a011e0ef585f5dd3cef41776
| -rw-r--r-- | Android.mk | 3 | ||||
| -rw-r--r-- | config.h | 25 |
2 files changed, 8 insertions, 20 deletions
@@ -1204,8 +1204,7 @@ LOCAL_SRC_FILES := \ $(FFMPEG_LIBAVFORMAT_SRC_FILES) \ $(FFMPEG_LIBSWSCALE_SRC_FILES) -LOCAL_SRC_FILES_arm := \ - $(FFMPEG_LOCAL_SRC_FILES_armv7-a-neon) \ +#LOCAL_SRC_FILES_arm := \ libavutil/arm/asm.S \ libavutil/arm/cpu.c \ libavutil/arm/float_dsp_init_arm.c \ @@ -11,19 +11,8 @@ #define EXTERN_ASM #define SLIBSUF ".so" #define HAVE_MMX2 HAVE_MMXEXT -#ifdef ARCH_AARCH64 -#undef ARCH_AARCH64 -#define ARCH_AARCH64 1 -#else -#define ARCH_AARCH64 0 -#endif #define ARCH_ALPHA 0 -#ifdef ARCH_ARM -#undef ARCH_ARM -#define ARCH_ARM 1 -#else #define ARCH_ARM 0 -#endif #define ARCH_AVR32 0 #define ARCH_AVR32_AP 0 #define ARCH_AVR32_UC 0 @@ -45,12 +34,12 @@ #define ARCH_X86 0 #define ARCH_X86_32 0 #define ARCH_X86_64 0 -#define HAVE_ARMV5TE 1 -#define HAVE_ARMV6 1 -#define HAVE_ARMV6T2 1 -#define HAVE_NEON 1 -#define HAVE_VFP 1 -#define HAVE_VFPV3 1 +#define HAVE_ARMV5TE 0 +#define HAVE_ARMV6 0 +#define HAVE_ARMV6T2 0 +#define HAVE_NEON 0 +#define HAVE_VFP 0 +#define HAVE_VFPV3 0 #define HAVE_AMD3DNOW 0 #define HAVE_AMD3DNOWEXT 0 #define HAVE_AVX 0 @@ -400,7 +389,7 @@ #define CONFIG_DWT 1 #define CONFIG_ERROR_RESILIENCE 1 #define CONFIG_FAST_UNALIGNED 1 -#define CONFIG_FFT 1 +#define CONFIG_FFT 0 #define CONFIG_FTRAPV 0 #define CONFIG_GPL 0 #define CONFIG_GRAY 0 |