[FFmpeg-cvslog] arm: Check for have_vfp_vm instead of !have_vfpv3 for float_dsp_vfp

Martin Storsjö git at videolan.org
Sun Nov 12 04:31:33 EET 2017


ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Mon Oct 23 10:44:07 2017 +0300| [17f5171cd4753e7f50e6d95df069bccbc90265bf] | committer: Martin Storsjö

arm: Check for have_vfp_vm instead of !have_vfpv3 for float_dsp_vfp

This was missed in e2710e790c0 since those functions weren't exercised
by checkasm.

Signed-off-by: Martin Storsjö <martin at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=17f5171cd4753e7f50e6d95df069bccbc90265bf
---

 libavutil/arm/float_dsp_init_vfp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavutil/arm/float_dsp_init_vfp.c b/libavutil/arm/float_dsp_init_vfp.c
index 61ff2ed38e..79ba6ecd3d 100644
--- a/libavutil/arm/float_dsp_init_vfp.c
+++ b/libavutil/arm/float_dsp_init_vfp.c
@@ -36,11 +36,11 @@ void ff_butterflies_float_vfp(float *restrict v1, float *restrict v2, int len);
 
 av_cold void ff_float_dsp_init_vfp(AVFloatDSPContext *fdsp, int cpu_flags)
 {
-    if (!have_vfpv3(cpu_flags)) {
+    if (have_vfp_vm(cpu_flags)) {
         fdsp->vector_fmul = ff_vector_fmul_vfp;
         fdsp->vector_fmul_window = ff_vector_fmul_window_vfp;
     }
     fdsp->vector_fmul_reverse = ff_vector_fmul_reverse_vfp;
-    if (!have_vfpv3(cpu_flags))
+    if (have_vfp_vm(cpu_flags))
         fdsp->butterflies_float = ff_butterflies_float_vfp;
 }



More information about the ffmpeg-cvslog mailing list