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

libavcodec: MIPS: MMI: Fix type mismatches

Browse Source 
GCC complains about them.

Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Reviewed-by: Shiyou Yin <yinshiyou-hf@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
pull/345/head
Jiaxun Yang 4 years ago committed by Michael Niedermayer
parent e2fa12e3ae
commit 7a7ed1699c
4 changed files with 22 additions and 22 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. 18
      libavcodec/mips/h264dsp_mips.h
  2. 18
      libavcodec/mips/h264dsp_mmi.c
  3. 4
      libavcodec/mips/xvid_idct_mmi.c
  4. 4
      libavcodec/mips/xvididct_mips.h

18
libavcodec/mips/h264dsp_mips.h
Unescape View File

@ -357,23 +357,23 @@ void ff_h264_biweight_pixels4_8_mmi(uint8_t *dst, uint8_t *src,
void ff_deblock_v_chroma_8_mmi(uint8_t *pix, ptrdiff_t stride, int alpha, int beta,
int8_t *tc0);
void ff_deblock_v_chroma_intra_8_mmi(uint8_t *pix, int stride, int alpha,
void ff_deblock_v_chroma_intra_8_mmi(uint8_t *pix, ptrdiff_t stride, int alpha,
int beta);
void ff_deblock_h_chroma_8_mmi(uint8_t *pix, int stride, int alpha, int beta,
void ff_deblock_h_chroma_8_mmi(uint8_t *pix, ptrdiff_t stride, int alpha, int beta,
int8_t *tc0);
void ff_deblock_h_chroma_intra_8_mmi(uint8_t *pix, int stride, int alpha,
void ff_deblock_h_chroma_intra_8_mmi(uint8_t *pix, ptrdiff_t stride, int alpha,
int beta);
void ff_deblock_v_luma_8_mmi(uint8_t *pix, int stride, int alpha, int beta,
void ff_deblock_v_luma_8_mmi(uint8_t *pix, ptrdiff_t stride, int alpha, int beta,
int8_t *tc0);
void ff_deblock_v_luma_intra_8_mmi(uint8_t *pix, int stride, int alpha,
void ff_deblock_v_luma_intra_8_mmi(uint8_t *pix, ptrdiff_t stride, int alpha,
int beta);
void ff_deblock_h_luma_8_mmi(uint8_t *pix, int stride, int alpha, int beta,
void ff_deblock_h_luma_8_mmi(uint8_t *pix, ptrdiff_t stride, int alpha, int beta,
int8_t *tc0);
void ff_deblock_h_luma_intra_8_mmi(uint8_t *pix, int stride, int alpha,
void ff_deblock_h_luma_intra_8_mmi(uint8_t *pix, ptrdiff_t stride, int alpha,
int beta);
void ff_deblock_v8_luma_8_mmi(uint8_t *pix, int stride, int alpha, int beta,
void ff_deblock_v8_luma_8_mmi(uint8_t *pix, ptrdiff_t stride, int alpha, int beta,
int8_t *tc0);
void ff_deblock_v8_luma_intra_8_mmi(uint8_t *pix, int stride, int alpha,
void ff_deblock_v8_luma_intra_8_mmi(uint8_t *pix, ptrdiff_t stride, int alpha,
int beta);
void ff_put_h264_qpel16_mc00_mmi(uint8_t *dst, const uint8_t *src,

18
libavcodec/mips/h264dsp_mmi.c
Unescape View File

@ -1433,7 +1433,7 @@ void ff_h264_biweight_pixels4_8_mmi(uint8_t *dst, uint8_t *src,
}
}
void ff_deblock_v8_luma_8_mmi(uint8_t *pix, int stride, int alpha, int beta,
void ff_deblock_v8_luma_8_mmi(uint8_t *pix, ptrdiff_t stride, int alpha, int beta,
int8_t *tc0)
{
double ftmp[12];
@ -1561,7 +1561,7 @@ void ff_deblock_v8_luma_8_mmi(uint8_t *pix, int stride, int alpha, int beta,
);
}
static void deblock_v8_luma_intra_8_mmi(uint8_t *pix, int stride, int alpha,
static void deblock_v8_luma_intra_8_mmi(uint8_t *pix, ptrdiff_t stride, int alpha,
int beta)
{
DECLARE_ALIGNED(8, const uint64_t, stack[0x0a]);
@ -1871,7 +1871,7 @@ void ff_deblock_v_chroma_8_mmi(uint8_t *pix, ptrdiff_t stride, int alpha,
);
}
void ff_deblock_v_chroma_intra_8_mmi(uint8_t *pix, int stride, int alpha,
void ff_deblock_v_chroma_intra_8_mmi(uint8_t *pix, ptrdiff_t stride, int alpha,
int beta)
{
double ftmp[9];
@ -1949,7 +1949,7 @@ void ff_deblock_v_chroma_intra_8_mmi(uint8_t *pix, int stride, int alpha,
);
}
void ff_deblock_h_chroma_8_mmi(uint8_t *pix, int stride, int alpha, int beta,
void ff_deblock_h_chroma_8_mmi(uint8_t *pix, ptrdiff_t stride, int alpha, int beta,
int8_t *tc0)
{
double ftmp[11];
@ -2089,7 +2089,7 @@ void ff_deblock_h_chroma_8_mmi(uint8_t *pix, int stride, int alpha, int beta,
);
}
void ff_deblock_h_chroma_intra_8_mmi(uint8_t *pix, int stride, int alpha,
void ff_deblock_h_chroma_intra_8_mmi(uint8_t *pix, ptrdiff_t stride, int alpha,
int beta)
{
double ftmp[11];
@ -2222,7 +2222,7 @@ void ff_deblock_h_chroma_intra_8_mmi(uint8_t *pix, int stride, int alpha,
);
}
void ff_deblock_v_luma_8_mmi(uint8_t *pix, int stride, int alpha, int beta,
void ff_deblock_v_luma_8_mmi(uint8_t *pix, ptrdiff_t stride, int alpha, int beta,
int8_t *tc0)
{
if ((tc0[0] & tc0[1]) >= 0)
@ -2231,14 +2231,14 @@ void ff_deblock_v_luma_8_mmi(uint8_t *pix, int stride, int alpha, int beta,
ff_deblock_v8_luma_8_mmi(pix + 8, stride, alpha, beta, tc0 + 2);
}
void ff_deblock_v_luma_intra_8_mmi(uint8_t *pix, int stride, int alpha,
void ff_deblock_v_luma_intra_8_mmi(uint8_t *pix, ptrdiff_t stride, int alpha,
int beta)
{
deblock_v8_luma_intra_8_mmi(pix + 0, stride, alpha, beta);
deblock_v8_luma_intra_8_mmi(pix + 8, stride, alpha, beta);
}
void ff_deblock_h_luma_8_mmi(uint8_t *pix, int stride, int alpha, int beta,
void ff_deblock_h_luma_8_mmi(uint8_t *pix, ptrdiff_t stride, int alpha, int beta,
int8_t *tc0)
{
DECLARE_ALIGNED(8, const uint64_t, stack[0x0d]);
@ -2457,7 +2457,7 @@ void ff_deblock_h_luma_8_mmi(uint8_t *pix, int stride, int alpha, int beta,
);
}
void ff_deblock_h_luma_intra_8_mmi(uint8_t *pix, int stride, int alpha,
void ff_deblock_h_luma_intra_8_mmi(uint8_t *pix, ptrdiff_t stride, int alpha,
int beta)
{
DECLARE_ALIGNED(8, const uint64_t, ptmp[0x11]);

4
libavcodec/mips/xvid_idct_mmi.c
Unescape View File

@ -240,13 +240,13 @@ void ff_xvid_idct_mmi(int16_t *block)
);
}
void ff_xvid_idct_put_mmi(uint8_t *dest, int32_t line_size, int16_t *block)
void ff_xvid_idct_put_mmi(uint8_t *dest, ptrdiff_t line_size, int16_t *block)
{
ff_xvid_idct_mmi(block);
ff_put_pixels_clamped_mmi(block, dest, line_size);
}
void ff_xvid_idct_add_mmi(uint8_t *dest, int32_t line_size, int16_t *block)
void ff_xvid_idct_add_mmi(uint8_t *dest, ptrdiff_t line_size, int16_t *block)
{
ff_xvid_idct_mmi(block);
ff_add_pixels_clamped_mmi(block, dest, line_size);

4
libavcodec/mips/xvididct_mips.h
Unescape View File

@ -24,7 +24,7 @@
#include "libavcodec/xvididct.h"
void ff_xvid_idct_mmi(int16_t *block);
void ff_xvid_idct_put_mmi(uint8_t *dest, int32_t line_size, int16_t *block);
void ff_xvid_idct_add_mmi(uint8_t *dest, int32_t line_size, int16_t *block);
void ff_xvid_idct_put_mmi(uint8_t *dest, ptrdiff_t line_size, int16_t *block);
void ff_xvid_idct_add_mmi(uint8_t *dest, ptrdiff_t line_size, int16_t *block);
#endif /* AVCODEC_MIPS_XVIDIDCT_MIPS_H */

Write Preview
Loading…
Cancel
Save