diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-08 14:24:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-08 14:24:16 +0100 |
| commit | aba1a48cc5b3f1ee77d5b8e9e72c27bbf3625d85 (patch) | |
| tree | ee196d11ef4664211aa64b3e64855786437eccaf /libavutil | |
| parent | 89c8eaa3216a48c1d18cc390525e90db74513f0c (diff) | |
| parent | b326755989b346d0d935e0628e8865f9b2951c30 (diff) | |
| download | ffmpeg-aba1a48cc5b3f1ee77d5b8e9e72c27bbf3625d85.tar.gz | |
Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'
* commit 'b326755989b346d0d935e0628e8865f9b2951c30':
arm: rename ARMVFP config symbol to VFP
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/arm/Makefile | 4 | ||||
| -rw-r--r-- | libavutil/arm/asm.S | 2 | ||||
| -rw-r--r-- | libavutil/arm/cpu.c | 2 | ||||
| -rw-r--r-- | libavutil/arm/cpu.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/libavutil/arm/Makefile b/libavutil/arm/Makefile index ac7eca6751..5da44b0542 100644 --- a/libavutil/arm/Makefile +++ b/libavutil/arm/Makefile @@ -1,8 +1,8 @@ OBJS += arm/cpu.o \ arm/float_dsp_init_arm.o \ -ARMVFP-OBJS += arm/float_dsp_init_vfp.o \ - arm/float_dsp_vfp.o \ +VFP-OBJS += arm/float_dsp_init_vfp.o \ + arm/float_dsp_vfp.o \ NEON-OBJS += arm/float_dsp_init_neon.o \ arm/float_dsp_neon.o \ diff --git a/libavutil/arm/asm.S b/libavutil/arm/asm.S index 07bb6ae5b9..6061e47a63 100644 --- a/libavutil/arm/asm.S +++ b/libavutil/arm/asm.S @@ -46,7 +46,7 @@ #if HAVE_NEON .fpu neon -#elif HAVE_ARMVFP +#elif HAVE_VFP .fpu vfp #endif diff --git a/libavutil/arm/cpu.c b/libavutil/arm/cpu.c index 33dca1c65a..7058aeb1f1 100644 --- a/libavutil/arm/cpu.c +++ b/libavutil/arm/cpu.c @@ -24,7 +24,7 @@ int ff_get_cpu_flags_arm(void) return AV_CPU_FLAG_ARMV5TE * HAVE_ARMV5TE | AV_CPU_FLAG_ARMV6 * HAVE_ARMV6 | AV_CPU_FLAG_ARMV6T2 * HAVE_ARMV6T2 | - AV_CPU_FLAG_VFP * HAVE_ARMVFP | + AV_CPU_FLAG_VFP * HAVE_VFP | AV_CPU_FLAG_VFPV3 * HAVE_VFPV3 | AV_CPU_FLAG_NEON * HAVE_NEON; } diff --git a/libavutil/arm/cpu.h b/libavutil/arm/cpu.h index 72e16d409f..91c959ab27 100644 --- a/libavutil/arm/cpu.h +++ b/libavutil/arm/cpu.h @@ -25,7 +25,7 @@ #define have_armv5te(flags) (HAVE_ARMV5TE && ((flags) & AV_CPU_FLAG_ARMV5TE)) #define have_armv6(flags) (HAVE_ARMV6 && ((flags) & AV_CPU_FLAG_ARMV6)) #define have_armv6t2(flags) (HAVE_ARMV6T2 && ((flags) & AV_CPU_FLAG_ARMV6T2)) -#define have_vfp(flags) (HAVE_ARMVFP && ((flags) & AV_CPU_FLAG_VFP)) +#define have_vfp(flags) (HAVE_VFP && ((flags) & AV_CPU_FLAG_VFP)) #define have_vfpv3(flags) (HAVE_VFPV3 && ((flags) & AV_CPU_FLAG_VFPV3)) #define have_neon(flags) (HAVE_NEON && ((flags) & AV_CPU_FLAG_NEON)) |