diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 14:13:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 14:13:54 +0100 |
| commit | 24604ebaf85b5436d10da811f455dd710b353aca (patch) | |
| tree | 46988a19c56e7914715dc3852e6588fb887c6c77 /libavutil/arm/float_dsp_init_neon.c | |
| parent | 6e6e1708984e45881b9a5d4e26c3e7de852c54d5 (diff) | |
| parent | 5959bfaca396ecaf63a8123055f499688b79cae3 (diff) | |
| download | ffmpeg-24604ebaf85b5436d10da811f455dd710b353aca.tar.gz | |
Merge commit '5959bfaca396ecaf63a8123055f499688b79cae3'
* commit '5959bfaca396ecaf63a8123055f499688b79cae3':
floatdsp: move butterflies_float from dsputil to avfloatdsp.
Conflicts:
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/imc.c
libavcodec/mpegaudiodec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/arm/float_dsp_init_neon.c')
| -rw-r--r-- | libavutil/arm/float_dsp_init_neon.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavutil/arm/float_dsp_init_neon.c b/libavutil/arm/float_dsp_init_neon.c index c6f02bd2c5..b3644e82a2 100644 --- a/libavutil/arm/float_dsp_init_neon.c +++ b/libavutil/arm/float_dsp_init_neon.c @@ -41,6 +41,8 @@ void ff_vector_fmul_add_neon(float *dst, const float *src0, const float *src1, void ff_vector_fmul_reverse_neon(float *dst, const float *src0, const float *src1, int len); +void ff_butterflies_float_neon(float *v1, float *v2, int len); + void ff_float_dsp_init_neon(AVFloatDSPContext *fdsp) { fdsp->vector_fmul = ff_vector_fmul_neon; @@ -49,4 +51,5 @@ void ff_float_dsp_init_neon(AVFloatDSPContext *fdsp) fdsp->vector_fmul_window = ff_vector_fmul_window_neon; fdsp->vector_fmul_add = ff_vector_fmul_add_neon; fdsp->vector_fmul_reverse = ff_vector_fmul_reverse_neon; + fdsp->butterflies_float = ff_butterflies_float_neon; } |