diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-16 12:38:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-16 12:38:41 +0100 |
| commit | 5c7e9e16c961f1f7258734426afac3cee4349580 (patch) | |
| tree | 20ea7bec723ef262bffb8f2447adcc1dc3d98069 /libavutil/arm/float_dsp_init_neon.c | |
| parent | 0e79fe37e5c5500db2e65ce6b7ea0bbdb3f24665 (diff) | |
| parent | e034cc6c60c77dce390b1ac31141b1862bdf8999 (diff) | |
| download | ffmpeg-5c7e9e16c961f1f7258734426afac3cee4349580.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavc: Move vector_fmul_window to AVFloatDSPContext
rtpdec_mpeg4: Check the remaining amount of data before reading
Conflicts:
libavcodec/dsputil.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 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavutil/arm/float_dsp_init_neon.c b/libavutil/arm/float_dsp_init_neon.c index 88eb4b3d2a..16ea47154a 100644 --- a/libavutil/arm/float_dsp_init_neon.c +++ b/libavutil/arm/float_dsp_init_neon.c @@ -32,9 +32,13 @@ void ff_vector_fmac_scalar_neon(float *dst, const float *src, float mul, void ff_vector_fmul_scalar_neon(float *dst, const float *src, float mul, int len); +void ff_vector_fmul_window_neon(float *dst, const float *src0, + const float *src1, const float *win, int len); + void ff_float_dsp_init_neon(AVFloatDSPContext *fdsp) { fdsp->vector_fmul = ff_vector_fmul_neon; fdsp->vector_fmac_scalar = ff_vector_fmac_scalar_neon; fdsp->vector_fmul_scalar = ff_vector_fmul_scalar_neon; + fdsp->vector_fmul_window = ff_vector_fmul_window_neon; } |