Merge commit '38675229a879aa5258a8c71891fc8cbf74cf139f'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Mar 2014 00:01:37 +0000 (01:01 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Mar 2014 00:01:37 +0000 (01:01 +0100)
commitd926c4b240edd86d9ee5c1b449968ac91eeaa918
treeba72934d12b504eb23a9cd6e79c7588dd3dcc74f
parent55f53f6c29acd459df64abf20cbd016c420b6cf6
parent38675229a879aa5258a8c71891fc8cbf74cf139f
Merge commit '38675229a879aa5258a8c71891fc8cbf74cf139f'

* commit '38675229a879aa5258a8c71891fc8cbf74cf139f':
  dsputil_mmx: K&R formatting cosmetics

Conflicts:
libavcodec/x86/dsputil_mmx.c

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