Merge commit 'bd255f9feb4deea4c990e582f0ba3b90d7b64b4c'

[ffmpeg] / libavcodec / arm / Makefile

diff --git a/libavcodec/arm/Makefile b/libavcodec/arm/Makefile
index acfd6262911834de8f6dfabcee1bbfe16801ea73..b315d8da0e47170567f3aeb98c9f492552ead50d 100644 (file)
--- 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                \