ffmpeg | branch: master | Vicente Olivert Riera <vincent.ri...@imgtec.com> | Wed Oct 12 16:09:40 2016 +0100| [04b0792e4a7ac2866d269f9a1a921385ad410964] | committer: Michael Niedermayer
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.ri...@imgtec.com> Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=04b0792e4a7ac2866d269f9a1a921385ad410964 --- libavcodec/mips/h264dsp_msa.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/mips/h264dsp_msa.c b/libavcodec/mips/h264dsp_msa.c index fce01ac..16e4858 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) { _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog