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

Martin Storsjö git at videolan.org
Mon Oct 23 14:31:44 EEST 2017


ffmpeg | branch: release/3.4 | Martin Storsjö <martin at martin.st> | Mon Oct 23 10:48:02 2017 +0300| [587fadaef1e8163b3e56043e500a3724e7fc5379] | committer: Carl Eugen Hoyos

lavu/arm: Check for have_vfp_vm instead of !have_vfpv3 for float_dsp_vfp

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

Fixes ticket #6766.
(cherry picked from commit f1fd12ef858cf7efe843aa3063894a11b2d1e7d5)

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

 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 e15abf3f54..05873e7e37 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 *av_restrict v1, float *av_restrict v2, int
 
 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