Michael Niedermayer ea41e6d637 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: 9c669672c7
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-11-24 12:13:00 +01:00

2.0 KiB

Raw Blame History

View Raw