* commit '25841dfe':
  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@gmx.at>