Commit 04b0792e authored by Vicente Olivert Riera's avatar Vicente Olivert Riera Committed by 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 bc26fe89:

  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: 's avatarVicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 4d81f963
...@@ -2495,21 +2495,21 @@ void ff_h264_h_loop_filter_luma_mbaff_intra_msa(uint8_t *src, ...@@ -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); 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 height, int log2_denom,
int weight_src, int offset) int weight_src, int offset)
{ {
avc_wgt_16width_msa(src, stride, height, log2_denom, weight_src, 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 height, int log2_denom,
int weight_src, int offset) int weight_src, int offset)
{ {
avc_wgt_8width_msa(src, stride, height, log2_denom, weight_src, 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 height, int log2_denom,
int weight_src, int offset) int weight_src, int offset)
{ {
...@@ -2517,7 +2517,7 @@ void ff_weight_h264_pixels4_8_msa(uint8_t *src, int stride, ...@@ -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, 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 log2_denom, int weight_dst,
int weight_src, int offset) int weight_src, int offset)
{ {
...@@ -2526,7 +2526,7 @@ void ff_biweight_h264_pixels16_8_msa(uint8_t *dst, uint8_t *src, ...@@ -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, 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 log2_denom, int weight_dst,
int weight_src, int offset) int weight_src, int offset)
{ {
...@@ -2535,7 +2535,7 @@ void ff_biweight_h264_pixels8_8_msa(uint8_t *dst, uint8_t *src, ...@@ -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, 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 log2_denom, int weight_dst,
int weight_src, int offset) int weight_src, int offset)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment