* commit 'f8bbebec':
  x86: motion_est: K&R formatting cosmetics

Conflicts:
	libavcodec/x86/motion_est.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>