diff mbox

[FFmpeg-devel] libavcodec/mips/h264dsp_msa.c: fix type in some function parameters

Message ID 20161012150940.27356-1-Vincent.Riera@imgtec.com
State Accepted
Commit 04b0792e4a7ac2866d269f9a1a921385ad410964
Headers show

Commit Message

Vicente Olivert Riera Oct. 12, 2016, 3:09 p.m. UTC 
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>
---
 libavcodec/mips/h264dsp_msa.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Comments

Michael Niedermayer Oct. 13, 2016, 5:14 p.m. UTC | #1 
On Wed, Oct 12, 2016 at 04:09:40PM +0100, Vicente Olivert Riera wrote:
> 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>
> ---
>  libavcodec/mips/h264dsp_msa.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)

applied

thx

[...]
diff mbox

Patch

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