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/arm/rv40dsp_init_arm.c | |
| parent | 849f015406e77921a2adbe05e58b0e65cbf035c5 (diff) | |
| parent | a8b6015823e628047a45916404c00044c5e80415 (diff) | |
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/arm/rv40dsp_init_arm.c')
| -rw-r--r-- | libavcodec/arm/rv40dsp_init_arm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/arm/rv40dsp_init_arm.c b/libavcodec/arm/rv40dsp_init_arm.c index 59ef10b24b..fec37022da 100644 --- a/libavcodec/arm/rv40dsp_init_arm.c +++ b/libavcodec/arm/rv40dsp_init_arm.c @@ -27,7 +27,7 @@ #define DECL_QPEL3(type, w, pos) \ void ff_##type##_rv40_qpel##w##_mc##pos##_neon(uint8_t *dst, uint8_t *src,\ - int stride) + ptrdiff_t stride) #define DECL_QPEL2(w, pos) \ DECL_QPEL3(put, w, pos); \ DECL_QPEL3(avg, w, pos) |