Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

libavcodec/mips/h264dsp_msa.c: fix type in some function parameters

Browse Source 
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>
pull/237/merge
Vicente Olivert Riera 8 years ago committed by Michael Niedermayer
parent 4d81f9631d
commit 04b0792e4a
1 changed files with 6 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      libavcodec/mips/h264dsp_msa.c

12
libavcodec/mips/h264dsp_msa.c
Unescape View File

@ -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)
{

Write Preview
Loading…
Cancel
Save