[FFmpeg-cvslog] Merge commit '25841dfe806a13de526ae09c11149ab1f83555a8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb  6 12:18:25 2013 +0100| [ede45c4e1da8bd2fefc89ea63e57a49e6c0a3e19] | committer: Michael Niedermayer

Merge commit '25841dfe806a13de526ae09c11149ab1f83555a8'

* commit '25841dfe806a13de526ae09c11149ab1f83555a8':
  Use ptrdiff_t instead of int for {avg, put}_pixels line_size parameter.

Conflicts:
	libavcodec/alpha/dsputil_alpha.c
	libavcodec/dsputil_template.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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