diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 14:18:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 14:18:53 +0100 |
| commit | db4e4f766c0739f08eb66696395a66e47378189c (patch) | |
| tree | 73dc557065ad26a7ca332339ae54d0e7c07aba0a /libavcodec/vc1dsp.c | |
| parent | 849f015406e77921a2adbe05e58b0e65cbf035c5 (diff) | |
| parent | a8b6015823e628047a45916404c00044c5e80415 (diff) | |
| download | ffmpeg-db4e4f766c0739f08eb66696395a66e47378189c.tar.gz | |
Merge commit 'a8b6015823e628047a45916404c00044c5e80415'
* commit 'a8b6015823e628047a45916404c00044c5e80415':
dsputil: convert remaining functions to use ptrdiff_t strides
Conflicts:
libavcodec/dsputil.h
libavcodec/dsputil_template.c
libavcodec/h264qpel_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vc1dsp.c')
| -rw-r--r-- | libavcodec/vc1dsp.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/libavcodec/vc1dsp.c b/libavcodec/vc1dsp.c index 260eda401b..8d27399c9d 100644 --- a/libavcodec/vc1dsp.c +++ b/libavcodec/vc1dsp.c @@ -640,11 +640,17 @@ VC1_MSPEL_MC(op_avg, op4_avg, avg_) /* pixel functions - really are entry points to vc1_mspel_mc */ #define PUT_VC1_MSPEL(a, b)\ -static void put_vc1_mspel_mc ## a ## b ##_c(uint8_t *dst, const uint8_t *src, int stride, int rnd) { \ - put_vc1_mspel_mc(dst, src, stride, a, b, rnd); \ -}\ -static void avg_vc1_mspel_mc ## a ## b ##_c(uint8_t *dst, const uint8_t *src, int stride, int rnd) { \ - avg_vc1_mspel_mc(dst, src, stride, a, b, rnd); \ +static void put_vc1_mspel_mc ## a ## b ##_c(uint8_t *dst, \ + const uint8_t *src, \ + ptrdiff_t stride, int rnd) \ +{ \ + put_vc1_mspel_mc(dst, src, stride, a, b, rnd); \ +} \ +static void avg_vc1_mspel_mc ## a ## b ##_c(uint8_t *dst, \ + const uint8_t *src, \ + ptrdiff_t stride, int rnd) \ +{ \ + avg_vc1_mspel_mc(dst, src, stride, a, b, rnd); \ } PUT_VC1_MSPEL(1, 0) |