diff options
| author | Vicente Olivert Riera <Vincent.Riera@imgtec.com> | 2016-10-12 16:09:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-10-13 19:15:48 +0200 |
| commit | 04b0792e4a7ac2866d269f9a1a921385ad410964 (patch) | |
| tree | 553d692d1142ab7b5ded8f31b9acfa0953e4c8e4 | |
| parent | 4d81f9631de70cd460413bc6aad22005c8dc6bf0 (diff) | |
| download | ffmpeg-04b0792e4a7ac2866d269f9a1a921385ad410964.tar.gz | |
libavcodec/mips/h264dsp_msa.c: fix type in some function parameters
This fixes a build problem for MIPS architecture that looks like this:
libavcodec/mips/h264dsp_msa.c:2498:6: error: conflicting types for
‘ff_weight_h264_pixels16_8_msa’
void ff_weight_h264_pixels16_8_msa(uint8_t *src, int stride,
This bug was introduced by commit bc26fe89275c267d169b468356c82ee59874407d:
avcodec/h264: Use ptrdiff_t for (bi)weight functions
That commit changed the data type of some function parameters in some
function definitions. However, the implementation of those functions in
libavcodec/mips/h264dsp_msa.c wasn't changed accordingly.
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/mips/h264dsp_msa.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/mips/h264dsp_msa.c b/libavcodec/mips/h264dsp_msa.c index fce01ac91c..16e4858e6b 100644 --- a/libavcodec/mips/h264dsp_msa.c +++ b/libavcodec/mips/h264dsp_msa.c @@ -2495,21 +2495,21 @@ void ff_h264_h_loop_filter_luma_mbaff_intra_msa(uint8_t *src, avc_h_loop_filter_luma_mbaff_intra_msa(src, ystride, alpha, beta); } -void ff_weight_h264_pixels16_8_msa(uint8_t *src, int stride, +void ff_weight_h264_pixels16_8_msa(uint8_t *src, ptrdiff_t stride, int height, int log2_denom, int weight_src, int offset) { avc_wgt_16width_msa(src, stride, height, log2_denom, weight_src, offset); } -void ff_weight_h264_pixels8_8_msa(uint8_t *src, int stride, +void ff_weight_h264_pixels8_8_msa(uint8_t *src, ptrdiff_t stride, int height, int log2_denom, int weight_src, int offset) { avc_wgt_8width_msa(src, stride, height, log2_denom, weight_src, offset); } -void ff_weight_h264_pixels4_8_msa(uint8_t *src, int stride, +void ff_weight_h264_pixels4_8_msa(uint8_t *src, ptrdiff_t stride, int height, int log2_denom, int weight_src, int offset) { @@ -2517,7 +2517,7 @@ void ff_weight_h264_pixels4_8_msa(uint8_t *src, int stride, } void ff_biweight_h264_pixels16_8_msa(uint8_t *dst, uint8_t *src, - int stride, int height, + ptrdiff_t stride, int height, int log2_denom, int weight_dst, int weight_src, int offset) { @@ -2526,7 +2526,7 @@ void ff_biweight_h264_pixels16_8_msa(uint8_t *dst, uint8_t *src, } void ff_biweight_h264_pixels8_8_msa(uint8_t *dst, uint8_t *src, - int stride, int height, + ptrdiff_t stride, int height, int log2_denom, int weight_dst, int weight_src, int offset) { @@ -2535,7 +2535,7 @@ void ff_biweight_h264_pixels8_8_msa(uint8_t *dst, uint8_t *src, } void ff_biweight_h264_pixels4_8_msa(uint8_t *dst, uint8_t *src, - int stride, int height, + ptrdiff_t stride, int height, int log2_denom, int weight_dst, int weight_src, int offset) { |