Merge commit 'f8bbebecfd7ea3dceb7c96f931beca33f80a3490'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Mar 2014 00:20:43 +0000 (01:20 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Mar 2014 00:20:43 +0000 (01:20 +0100)
commit925ce6faf4ddfaf8b0422de181b19bd75fa0dd68
treeff22cd0992c54c40c9026a796a0d06aae6224141
parentb7a5f5dc6662ed3d4641063ba62d3d03021db9f8
parentf8bbebecfd7ea3dceb7c96f931beca33f80a3490
Merge commit 'f8bbebecfd7ea3dceb7c96f931beca33f80a3490'

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

Conflicts:
libavcodec/x86/motion_est.c

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