diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 14:31:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 14:35:48 +0100 |
| commit | 019b378d90e04b77e1ae075696eafc3f44d21e27 (patch) | |
| tree | a82f1f14e8a84b195cba4f2309e72b5a79fbd776 /libavcodec | |
| parent | db4e4f766c0739f08eb66696395a66e47378189c (diff) | |
| download | ffmpeg-019b378d90e04b77e1ae075696eafc3f44d21e27.tar.gz | |
vc1: fix int/ptrdiff_t mismatches
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/vc1dsp.c | 4 | ||||
| -rw-r--r-- | libavcodec/vc1dsp.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/vc1dsp.c b/libavcodec/vc1dsp.c index 8d27399c9d..f66921a335 100644 --- a/libavcodec/vc1dsp.c +++ b/libavcodec/vc1dsp.c @@ -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 */ #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;\ \ @@ -619,7 +619,7 @@ static av_always_inline void OPNAME ## vc1_mspel_mc(uint8_t *dst, const uint8_t 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;\ for(i=0; i<8; i++){\ OP4(*(uint32_t*)(block ), AV_RN32(pixels ));\ diff --git a/libavcodec/vc1dsp.h b/libavcodec/vc1dsp.h index 6540eff0b8..851e40c735 100644 --- a/libavcodec/vc1dsp.h +++ b/libavcodec/vc1dsp.h @@ -31,7 +31,7 @@ #include "dsputil.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 { /* vc1 functions */ |