RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

vc1: fix int/ptrdiff_t mismatches 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-03-13 14:31:39 +01:00
parent db4e4f766c
commit 019b378d90
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/vc1dsp.c
View File

@ -565,7 +565,7 @@ static av_always_inline int vc1_mspel_filter(const uint8_t *src, int stride, int
/** Function used to do motion compensation with bicubic interpolation /** Function used to do motion compensation with bicubic interpolation
*/ */
#define VC1_MSPEL_MC(OP, OP4, OPNAME)\ #define VC1_MSPEL_MC(OP, OP4, OPNAME)\
static av_always_inline void OPNAME ## vc1_mspel_mc(uint8_t *dst, const uint8_t *src, int stride, int hmode, int vmode, int rnd)\ static av_always_inline void OPNAME ## vc1_mspel_mc(uint8_t *dst, const uint8_t *src, ptrdiff_t stride, int hmode, int vmode, int rnd)\
{\ {\
int i, j;\ int i, j;\
\ \
@ -619,7 +619,7 @@ static av_always_inline void OPNAME ## vc1_mspel_mc(uint8_t *dst, const uint8_t
src += stride;\ src += stride;\
}\ }\
}\ }\
static void OPNAME ## pixels8x8_c(uint8_t *block, const uint8_t *pixels, int line_size, int rnd){\ static void OPNAME ## pixels8x8_c(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int rnd){\
int i;\ int i;\
for(i=0; i<8; i++){\ for(i=0; i<8; i++){\
OP4(*(uint32_t*)(block ), AV_RN32(pixels ));\ OP4(*(uint32_t*)(block ), AV_RN32(pixels ));\

2
libavcodec/vc1dsp.h
View File

@ -31,7 +31,7 @@
#include "dsputil.h" #include "dsputil.h"
#include "h264chroma.h" #include "h264chroma.h"
typedef void (*vc1op_pixels_func)(uint8_t *block/*align width (8 or 16)*/, const uint8_t *pixels/*align 1*/, int line_size, int h); typedef void (*vc1op_pixels_func)(uint8_t *block/*align width (8 or 16)*/, const uint8_t *pixels/*align 1*/, ptrdiff_t line_size, int h);
typedef struct VC1DSPContext { typedef struct VC1DSPContext {
/* vc1 functions */ /* vc1 functions */