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/arm/asm.S | |
| parent | 89c8eaa3216a48c1d18cc390525e90db74513f0c (diff) | |
| parent | b326755989b346d0d935e0628e8865f9b2951c30 (diff) | |
Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'
* commit 'b326755989b346d0d935e0628e8865f9b2951c30':
arm: rename ARMVFP config symbol to VFP
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/arm/asm.S')
| -rw-r--r-- | libavutil/arm/asm.S | 2 |
1 files changed, 1 insertions, 1 deletions
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 |