Commit a839d6ab authored by Mans Rullgard's avatar Mans Rullgard

ARM: fix float_dsp breakage from d5a7229b

Signed-off-by: 's avatarMans Rullgard <mans@mansr.com>
parent d5a7229b
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include "libavutil/float_dsp.h" #include "libavutil/float_dsp.h"
void ff_dsputil_init_vfp (AVFloatDSPContext *fdsp); void ff_float_dsp_init_vfp (AVFloatDSPContext *fdsp);
void ff_dsputil_init_neon(AVFloatDSPContext *fdsp); void ff_float_dsp_init_neon(AVFloatDSPContext *fdsp);
#endif /* AVUTIL_ARM_FLOAT_DSP_ARM_H */ #endif /* AVUTIL_ARM_FLOAT_DSP_ARM_H */
...@@ -27,7 +27,7 @@ void ff_float_dsp_init_arm(AVFloatDSPContext *fdsp) ...@@ -27,7 +27,7 @@ void ff_float_dsp_init_arm(AVFloatDSPContext *fdsp)
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();
if (have_vfp(cpu_flags)) if (have_vfp(cpu_flags))
ff_dsputil_init_vfp(fdsp); ff_float_dsp_init_vfp(fdsp);
if (have_neon(cpu_flags)) if (have_neon(cpu_flags))
ff_dsputil_init_neon(fdsp); ff_float_dsp_init_neon(fdsp);
} }
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
void ff_vector_fmul_neon(float *dst, const float *src0, const float *src1, int len); void ff_vector_fmul_neon(float *dst, const float *src0, const float *src1, int len);
void ff_dsputil_init_neon(AVFloatDSPContext *fdsp) void ff_float_dsp_init_neon(AVFloatDSPContext *fdsp)
{ {
c->vector_fmul = ff_vector_fmul_neon; fdsp->vector_fmul = ff_vector_fmul_neon;
} }
...@@ -25,10 +25,10 @@ ...@@ -25,10 +25,10 @@
void ff_vector_fmul_vfp(float *dst, const float *src0, const float *src1, void ff_vector_fmul_vfp(float *dst, const float *src0, const float *src1,
int len); int len);
void ff_dsputil_init_vfp(DSPContext* c, AVCodecContext *avctx) void ff_float_dsp_init_vfp(AVFloatDSPContext *fdsp)
{ {
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();
if (!have_vfpv3(cpu_flags)) if (!have_vfpv3(cpu_flags))
c->vector_fmul = ff_vector_fmul_vfp; fdsp->vector_fmul = ff_vector_fmul_vfp;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment