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.h | |
| parent | d36a423445258a6906a8a93a0054784540ed804f (diff) | |
| parent | 52730e0f867fe77b7d2353d8b44e92edb7079ca5 (diff) | |
| download | ffmpeg-8316a0e08b899dcdb634bf184531e9e22d889068.tar.gz | |
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.h')
| -rw-r--r-- | libavcodec/iirfilter.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libavcodec/iirfilter.h b/libavcodec/iirfilter.h index 6f7bba67ac..5ffa1ce53a 100644 --- a/libavcodec/iirfilter.h +++ b/libavcodec/iirfilter.h @@ -27,7 +27,8 @@ #ifndef AVCODEC_IIRFILTER_H #define AVCODEC_IIRFILTER_H -#include "avcodec.h" +#include <stddef.h> +#include <stdint.h> struct FFIIRFilterCoeffs; struct FFIIRFilterState; @@ -61,7 +62,7 @@ typedef struct FFIIRFilterContext { */ void (*filter_flt)(const struct FFIIRFilterCoeffs *coeffs, struct FFIIRFilterState *state, int size, - const float *src, int sstep, float *dst, int dstep); + const float *src, ptrdiff_t sstep, float *dst, ptrdiff_t dstep); } FFIIRFilterContext; /** @@ -125,7 +126,7 @@ void ff_iir_filter_free_statep(struct FFIIRFilterState **state); * @param dstep destination stride */ void ff_iir_filter(const struct FFIIRFilterCoeffs *coeffs, struct FFIIRFilterState *state, - int size, const int16_t *src, int sstep, int16_t *dst, int dstep); + int size, const int16_t *src, ptrdiff_t sstep, int16_t *dst, ptrdiff_t dstep); /** * Perform IIR filtering on floating-point input samples. @@ -140,6 +141,7 @@ void ff_iir_filter(const struct FFIIRFilterCoeffs *coeffs, struct FFIIRFilterSta */ void ff_iir_filter_flt(const struct FFIIRFilterCoeffs *coeffs, struct FFIIRFilterState *state, int size, - const float *src, int sstep, float *dst, int dstep); + const float *src, ptrdiff_t sstep, + float *dst, ptrdiff_t dstep); #endif /* AVCODEC_IIRFILTER_H */ |