Module: libav Branch: master Commit: 7ffda66fd5c81af4725bff7c2c4f207ba2aa0613
Author: Diego Biurrun <[email protected]> Committer: Diego Biurrun <[email protected]> Date: Fri Aug 23 19:39:21 2013 +0200 arm: float_dsp: Propagate cpu_flags to vfp initialization function --- libavutil/arm/float_dsp_arm.h | 2 +- libavutil/arm/float_dsp_init_arm.c | 2 +- libavutil/arm/float_dsp_init_vfp.c | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/libavutil/arm/float_dsp_arm.h b/libavutil/arm/float_dsp_arm.h index 81fad3e..ec925ec 100644 --- 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 e45969e..39a5e95 100644 --- 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 b6a226a..31cb6ae 100644 --- 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; _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
