ARM: fix float_dsp breakage from d5a7229

Signed-off-by: Mans Rullgard <mans@mansr.com>
13 years ago · a839d6abf8
parent d5a7229ba4
commit a839d6abf8
4 changed files with 8 additions and 8 deletions
--- 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_dsputil_init_vfp (AVFloatDSPContext *fdsp);
-void ff_dsputil_init_neon(AVFloatDSPContext *fdsp);
+void ff_float_dsp_init_vfp (AVFloatDSPContext *fdsp);
+void ff_float_dsp_init_neon(AVFloatDSPContext *fdsp);

 #endif /* AVUTIL_ARM_FLOAT_DSP_ARM_H */
--- a/libavutil/arm/float_dsp_init_arm.c
+++ b/libavutil/arm/float_dsp_init_arm.c
@ -27,7 +27,7 @@ void ff_float_dsp_init_arm(AVFloatDSPContext *fdsp)
    int cpu_flags = av_get_cpu_flags();

    if (have_vfp(cpu_flags))
-        ff_dsputil_init_vfp(fdsp);
+        ff_float_dsp_init_vfp(fdsp);
    if (have_neon(cpu_flags))
-        ff_dsputil_init_neon(fdsp);
+        ff_float_dsp_init_neon(fdsp);
 }
--- a/libavutil/arm/float_dsp_init_neon.c
+++ b/libavutil/arm/float_dsp_init_neon.c
@ -26,7 +26,7 @@

 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;
 }
--- a/libavutil/arm/float_dsp_init_vfp.c
+++ b/libavutil/arm/float_dsp_init_vfp.c
@ -25,10 +25,10 @@
 void ff_vector_fmul_vfp(float *dst, const float *src0, const float *src1,
                        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();

    if (!have_vfpv3(cpu_flags))
-        c->vector_fmul = ff_vector_fmul_vfp;
+        fdsp->vector_fmul = ff_vector_fmul_vfp;
 }