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 /libavcodec | |
| 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 'libavcodec')
| -rw-r--r-- | libavcodec/arm/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/arm/Makefile b/libavcodec/arm/Makefile index acfd626291..b315d8da0e 100644 --- a/libavcodec/arm/Makefile +++ b/libavcodec/arm/Makefile @@ -48,9 +48,9 @@ ARMV6-OBJS += arm/dsputil_init_armv6.o \ arm/dsputil_armv6.o \ arm/simple_idct_armv6.o \ -ARMVFP-OBJS-$(HAVE_ARMV6) += arm/fmtconvert_vfp.o +VFP-OBJS-$(HAVE_ARMV6) += arm/fmtconvert_vfp.o -ARMVFP-OBJS += arm/dsputil_vfp.o \ +VFP-OBJS += arm/dsputil_vfp.o \ arm/dsputil_init_vfp.o \ NEON-OBJS-$(CONFIG_FFT) += arm/fft_neon.o \ |