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/mpegaudiodsp.h | |
parent | a0478341f34be544e28b83ecfd768922de309416 (diff) | |
parent | 2caa93b813adc5dbb7771dfe615da826a2947d18 (diff) |
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/mpegaudiodsp.h')
-rw-r--r-- | libavcodec/mpegaudiodsp.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/libavcodec/mpegaudiodsp.h b/libavcodec/mpegaudiodsp.h index b827163d61..0e4352deab 100644 --- a/libavcodec/mpegaudiodsp.h +++ b/libavcodec/mpegaudiodsp.h @@ -19,14 +19,18 @@ #ifndef AVCODEC_MPEGAUDIODSP_H #define AVCODEC_MPEGAUDIODSP_H +#include <stddef.h> #include <stdint.h> + #include "libavutil/common.h" typedef struct MPADSPContext { void (*apply_window_float)(float *synth_buf, float *window, - int *dither_state, float *samples, int incr); + int *dither_state, float *samples, + ptrdiff_t incr); void (*apply_window_fixed)(int32_t *synth_buf, int32_t *window, - int *dither_state, int16_t *samples, int incr); + int *dither_state, int16_t *samples, + ptrdiff_t incr); void (*dct32_float)(float *dst, const float *src); void (*dct32_fixed)(int *dst, const int *src); @@ -46,13 +50,13 @@ extern const int32_t ff_mpa_enwindow[257]; void ff_mpa_synth_filter_fixed(MPADSPContext *s, int32_t *synth_buf_ptr, int *synth_buf_offset, int32_t *window, int *dither_state, - int16_t *samples, int incr, + int16_t *samples, ptrdiff_t incr, int32_t *sb_samples); void ff_mpa_synth_filter_float(MPADSPContext *s, float *synth_buf_ptr, int *synth_buf_offset, float *window, int *dither_state, - float *samples, int incr, + float *samples, ptrdiff_t incr, float *sb_samples); void ff_mpadsp_init_aarch64(MPADSPContext *s); @@ -67,10 +71,10 @@ void ff_mpa_synth_init_fixed(int32_t *window); void ff_mpadsp_apply_window_float(float *synth_buf, float *window, int *dither_state, float *samples, - int incr); + ptrdiff_t incr); void ff_mpadsp_apply_window_fixed(int32_t *synth_buf, int32_t *window, int *dither_state, int16_t *samples, - int incr); + ptrdiff_t incr); void ff_imdct36_blocks_float(float *out, float *buf, float *in, int count, int switch_point, int block_type); |