Module: libav Branch: master Commit: a839d6abf870af82bdde8afdef40377eb31c82f8
Author: Mans Rullgard <[email protected]> Committer: Mans Rullgard <[email protected]> Date: Fri Jun 8 19:24:51 2012 +0100 ARM: fix float_dsp breakage from d5a7229 Signed-off-by: Mans Rullgard <[email protected]> --- libavutil/arm/float_dsp_arm.h | 4 ++-- libavutil/arm/float_dsp_init_arm.c | 4 ++-- libavutil/arm/float_dsp_init_neon.c | 4 ++-- libavutil/arm/float_dsp_init_vfp.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libavutil/arm/float_dsp_arm.h b/libavutil/arm/float_dsp_arm.h index 976e5a0..81fad3e 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_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 */ diff --git a/libavutil/arm/float_dsp_init_arm.c b/libavutil/arm/float_dsp_init_arm.c index 0fee861..a352bec 100644 --- 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); } diff --git a/libavutil/arm/float_dsp_init_neon.c b/libavutil/arm/float_dsp_init_neon.c index 1e732db..fa6d0d7 100644 --- 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; } diff --git a/libavutil/arm/float_dsp_init_vfp.c b/libavutil/arm/float_dsp_init_vfp.c index d58dbde..30a9ce4 100644 --- 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; } _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
