diff options
| author | James Almer <jamrial@gmail.com> | 2017-03-21 15:59:31 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-03-21 16:04:22 -0300 |
| commit | 9a0fbb9ca9256a2d081e440025b12f390d7380df (patch) | |
| tree | 8cd8e0e41a94193b8aa99060ea0910f79028f4af /libavcodec/aarch64 | |
| parent | a0478341f34be544e28b83ecfd768922de309416 (diff) | |
| parent | 2caa93b813adc5dbb7771dfe615da826a2947d18 (diff) | |
| download | ffmpeg-9a0fbb9ca9256a2d081e440025b12f390d7380df.tar.gz | |
Merge commit '2caa93b813adc5dbb7771dfe615da826a2947d18'
* commit '2caa93b813adc5dbb7771dfe615da826a2947d18':
mpegaudiodsp: Change type of array stride parameters to ptrdiff_t
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/aarch64')
| -rw-r--r-- | libavcodec/aarch64/mpegaudiodsp_init.c | 4 | ||||
| -rw-r--r-- | libavcodec/aarch64/mpegaudiodsp_neon.S | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/aarch64/mpegaudiodsp_init.c b/libavcodec/aarch64/mpegaudiodsp_init.c index b94514645f..e50e8da4e0 100644 --- a/libavcodec/aarch64/mpegaudiodsp_init.c +++ b/libavcodec/aarch64/mpegaudiodsp_init.c @@ -24,9 +24,9 @@ #include "config.h" void ff_mpadsp_apply_window_fixed_neon(int32_t *synth_buf, int32_t *window, - int *dither, int16_t *samples, int incr); + int *dither, int16_t *samples, ptrdiff_t incr); void ff_mpadsp_apply_window_float_neon(float *synth_buf, float *window, - int *dither, float *samples, int incr); + int *dither, float *samples, ptrdiff_t incr); av_cold void ff_mpadsp_init_aarch64(MPADSPContext *s) { diff --git a/libavcodec/aarch64/mpegaudiodsp_neon.S b/libavcodec/aarch64/mpegaudiodsp_neon.S index 97d2e1f088..cc7d9b321c 100644 --- a/libavcodec/aarch64/mpegaudiodsp_neon.S +++ b/libavcodec/aarch64/mpegaudiodsp_neon.S @@ -34,7 +34,6 @@ endconst .macro apply_window type, st function ff_mpadsp_apply_window_\type\()_neon, export=1 mov x7, x0 - sxtw x4, w4 // incr add x8, x0, #512<<2 ld1 {v0.4s,v1.4s,v2.4s,v3.4s}, [x7], #64 ld1 {v4.4s,v5.4s,v6.4s,v7.4s}, [x7], #64 |