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/x86/vc1dsp_init.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/x86/vc1dsp_init.c')
| -rw-r--r-- | libavcodec/x86/vc1dsp_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/x86/vc1dsp_init.c b/libavcodec/x86/vc1dsp_init.c index 3f0b67ce67..228f4dc03e 100644 --- a/libavcodec/x86/vc1dsp_init.c +++ b/libavcodec/x86/vc1dsp_init.c @@ -63,7 +63,7 @@ static void vc1_h_loop_filter16_sse4(uint8_t *src, int stride, int pq) } static void avg_vc1_mspel_mc00_mmxext(uint8_t *dst, const uint8_t *src, - int stride, int rnd) + ptrdiff_t stride, int rnd) { ff_avg_pixels8_mmxext(dst, src, stride, 8); } |