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/mips/iirfilter_mips.c | |
| 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/mips/iirfilter_mips.c')
| -rw-r--r-- | libavcodec/mips/iirfilter_mips.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/mips/iirfilter_mips.c b/libavcodec/mips/iirfilter_mips.c index 87db9ffe55..74f036fde6 100644 --- a/libavcodec/mips/iirfilter_mips.c +++ b/libavcodec/mips/iirfilter_mips.c @@ -67,9 +67,9 @@ typedef struct FFIIRFilterState { float x[1]; } FFIIRFilterState; -static void ff_iir_filter_flt_mips(const struct FFIIRFilterCoeffs *c, - struct FFIIRFilterState *s, int size, - const float *src, int sstep, float *dst, int dstep) +static void iir_filter_flt_mips(const struct FFIIRFilterCoeffs *c, + struct FFIIRFilterState *s, int size, + const float *src, ptrdiff_t sstep, float *dst, ptrdiff_t dstep) { if (c->order == 2) { int i; @@ -202,7 +202,7 @@ static void ff_iir_filter_flt_mips(const struct FFIIRFilterCoeffs *c, void ff_iir_filter_init_mips(FFIIRFilterContext *f) { #if HAVE_INLINE_ASM #if !HAVE_MIPS32R6 && !HAVE_MIPS64R6 - f->filter_flt = ff_iir_filter_flt_mips; + f->filter_flt = iir_filter_flt_mips; #endif /* !HAVE_MIPS32R6 && !HAVE_MIPS64R6 */ #endif /* HAVE_INLINE_ASM */ } |