Merge commit 'aebf07075f4244caf591a3af71e5872fe314e87b'

[ffmpeg] / libavcodec / arm / fft_init_arm.c

diff --git a/libavcodec/arm/fft_init_arm.c b/libavcodec/arm/fft_init_arm.c
index 5087f5f64de953898899ba32b4125dcd3f7707c3..055c2c1cb25ae056bceceb075d01484b3509a928 100644 (file)
--- a/libavcodec/arm/fft_init_arm.c
+++ b/libavcodec/arm/fft_init_arm.c
@@ -40,7 +40,7 @@ av_cold void ff_fft_init_arm(FFTContext *s)
 {
     int cpu_flags = av_get_cpu_flags();
 
-    if (have_vfp(cpu_flags) && !have_vfpv3(cpu_flags)) {
+    if (have_vfp_vm(cpu_flags)) {
         s->fft_calc     = ff_fft_calc_vfp;
 #if CONFIG_MDCT
         s->imdct_half   = ff_imdct_half_vfp;