arm: float_dsp: Propagate cpu_flags to vfp initialization function

diff --git a/libavutil/arm/float_dsp_arm.h b/libavutil/arm/float_dsp_arm.h
index 81fad3ef2f7bfe071246576201d42265222a1fa6..ec925ecf5c0801aa599d7251d708cce2eb952be2 100644 (file)
--- a/libavutil/arm/float_dsp_arm.h
+++ b/libavutil/arm/float_dsp_arm.h
@@ -23,7 +23,7 @@
 
 #include "libavutil/float_dsp.h"
 
-void ff_float_dsp_init_vfp (AVFloatDSPContext *fdsp);
+void ff_float_dsp_init_vfp(AVFloatDSPContext *fdsp, int cpu_flags);
 void ff_float_dsp_init_neon(AVFloatDSPContext *fdsp);
 
 #endif /* AVUTIL_ARM_FLOAT_DSP_ARM_H */

diff --git a/libavutil/arm/float_dsp_init_arm.c b/libavutil/arm/float_dsp_init_arm.c
index e45969e2eb8a960d4578e9ffab84c4fd43ec61b2..39a5e9590f8135ba1989dcecbf3568527ca3fd59 100644 (file)
--- a/libavutil/arm/float_dsp_init_arm.c
+++ b/libavutil/arm/float_dsp_init_arm.c
@@ -28,7 +28,7 @@ av_cold void ff_float_dsp_init_arm(AVFloatDSPContext *fdsp)
     int cpu_flags = av_get_cpu_flags();
 
     if (have_vfp(cpu_flags))
-        ff_float_dsp_init_vfp(fdsp);
+        ff_float_dsp_init_vfp(fdsp, cpu_flags);
     if (have_neon(cpu_flags))
         ff_float_dsp_init_neon(fdsp);
 }

diff --git a/libavutil/arm/float_dsp_init_vfp.c b/libavutil/arm/float_dsp_init_vfp.c
index b6a226a4ddb8734da0ac81c91b77e75ad8fc0c66..31cb6aea602f8b8c57ac3ebe3fdb62c6aea35593 100644 (file)
--- a/libavutil/arm/float_dsp_init_vfp.c
+++ b/libavutil/arm/float_dsp_init_vfp.c
@@ -29,10 +29,8 @@ void ff_vector_fmul_vfp(float *dst, const float *src0, const float *src1,
 void ff_vector_fmul_reverse_vfp(float *dst, const float *src0,
                                 const float *src1, int len);
 
-av_cold void ff_float_dsp_init_vfp(AVFloatDSPContext *fdsp)
+av_cold void ff_float_dsp_init_vfp(AVFloatDSPContext *fdsp, int cpu_flags)
 {
-    int cpu_flags = av_get_cpu_flags();
-
     if (!have_vfpv3(cpu_flags))
         fdsp->vector_fmul = ff_vector_fmul_vfp;
     fdsp->vector_fmul_reverse = ff_vector_fmul_reverse_vfp;