diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-20 11:26:00 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-20 11:27:48 +0100 |
| commit | 8316a0e08b899dcdb634bf184531e9e22d889068 (patch) | |
| tree | 1405127ffc3d85d2ca4a1b899bec813651cc5890 /libavcodec/iirfilter.c | |
| parent | d36a423445258a6906a8a93a0054784540ed804f (diff) | |
| parent | 52730e0f867fe77b7d2353d8b44e92edb7079ca5 (diff) | |
Merge commit '52730e0f867fe77b7d2353d8b44e92edb7079ca5'
* commit '52730e0f867fe77b7d2353d8b44e92edb7079ca5':
iir_filter: Change type of array stride parameters to ptrdiff_t
The merge also updates the MIPS code and drop the extra log.h include.
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec/iirfilter.c')
| -rw-r--r-- | libavcodec/iirfilter.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/iirfilter.c b/libavcodec/iirfilter.c index a8c9b9b826..b202515827 100644 --- a/libavcodec/iirfilter.c +++ b/libavcodec/iirfilter.c @@ -278,7 +278,8 @@ av_cold struct FFIIRFilterState *ff_iir_filter_init_state(int order) void ff_iir_filter(const struct FFIIRFilterCoeffs *c, struct FFIIRFilterState *s, int size, - const int16_t *src, int sstep, int16_t *dst, int dstep) + const int16_t *src, ptrdiff_t sstep, + int16_t *dst, ptrdiff_t dstep) { if (c->order == 2) { FILTER_O2(int16_t, S16) @@ -291,7 +292,8 @@ void ff_iir_filter(const struct FFIIRFilterCoeffs *c, void ff_iir_filter_flt(const struct FFIIRFilterCoeffs *c, struct FFIIRFilterState *s, int size, - const float *src, int sstep, float *dst, int dstep) + const float *src, ptrdiff_t sstep, + float *dst, ptrdiff_t dstep) { if (c->order == 2) { FILTER_O2(float, FLT) |