Merge commit 'a8b6015823e628047a45916404c00044c5e80415'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Mar 2013 13:18:53 +0000 (14:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Mar 2013 13:18:53 +0000 (14:18 +0100)
commitdb4e4f766c0739f08eb66696395a66e47378189c
tree73dc557065ad26a7ca332339ae54d0e7c07aba0a
parent849f015406e77921a2adbe05e58b0e65cbf035c5
parenta8b6015823e628047a45916404c00044c5e80415
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>
16 files changed:
libavcodec/arm/h264qpel_init_arm.c
libavcodec/arm/rv40dsp_init_arm.c
libavcodec/cavsdsp.c
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/h264qpel_template.c
libavcodec/ppc/h264_qpel.c
libavcodec/rv30dsp.c
libavcodec/rv40dsp.c
libavcodec/vc1dsp.c
libavcodec/x86/cavsdsp.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_mmx.h
libavcodec/x86/h264_qpel.c
libavcodec/x86/rv40dsp_init.c
libavcodec/x86/vc1dsp_mmx.c