[FFmpeg-cvslog] Merge commit '9c12c6ff9539e926df0b2a2299e915ae71872600'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Nov 24 11:39:26 2014 +0100| [ea41e6d6373063c3a2a9bf48ce8e1c2e6340b694] | committer: Michael Niedermayer

Merge commit '9c12c6ff9539e926df0b2a2299e915ae71872600'

* commit '9c12c6ff9539e926df0b2a2299e915ae71872600':
  motion_est: convert stride to ptrdiff_t

Conflicts:
	libavcodec/me_cmp.c
	libavcodec/ppc/me_cmp.c
	libavcodec/x86/me_cmp_init.c

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

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