Merge commit '25841dfe806a13de526ae09c11149ab1f83555a8'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Feb 2013 11:18:25 +0000 (12:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Feb 2013 11:18:25 +0000 (12:18 +0100)
commitede45c4e1da8bd2fefc89ea63e57a49e6c0a3e19
treec288d3a3a358016a16aefbe702b454a9777cf98f
parent127ff88639e78b9d16fecb973c41b86a843b4fa7
parent25841dfe806a13de526ae09c11149ab1f83555a8
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@gmx.at>
17 files changed:
libavcodec/alpha/dsputil_alpha.c
libavcodec/alpha/dsputil_alpha.h
libavcodec/arm/dsputil_init_arm.c
libavcodec/arm/dsputil_init_armv6.c
libavcodec/arm/dsputil_init_neon.c
libavcodec/bfin/dsputil_bfin.c
libavcodec/dsputil.h
libavcodec/dsputil_template.c
libavcodec/motion_est.c
libavcodec/ppc/dsputil_altivec.c
libavcodec/ppc/dsputil_altivec.h
libavcodec/sh4/dsputil_align.c
libavcodec/sparc/dsputil_vis.c
libavcodec/x86/dsputil_avg_template.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_rnd_template.c
libavcodec/x86/hpeldsp.asm