Merge commit 'f8bbebec'

* commit 'f8bbebec': x86: motion_est: K&R formatting cosmetics Conflicts: libavcodec/x86/motion_est.c Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'f8bbebec'
* commit 'f8bbebec': x86: motion_est: K&R formatting cosmetics Conflicts: libavcodec/x86/motion_est.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
925ce6fa · Michael Niedermayer · b7a5f5dc · f8bbebec · 925ce6fa
Commit 925ce6fa authored Mar 14, 2014 by Michael Niedermayer
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 161 additions and 150 deletions

motion_est.c libavcodec/x86/motion_est.c +161 -150

No files found.
--- a/libavcodec/x86/motion_est.c
+++ b/libavcodec/x86/motion_est.c