[FFmpeg-cvslog] Merge commit 'a8b6015823e628047a45916404c00044c5e80415'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 13 14:18:53 2013 +0100| [db4e4f766c0739f08eb66696395a66e47378189c] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=db4e4f766c0739f08eb66696395a66e47378189c
---