Merge commit '8d27bf1cff35be406b0fd89d832e1852d4c573bc'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 27 Aug 2014 19:20:39 +0000 (21:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 27 Aug 2014 19:20:39 +0000 (21:20 +0200)
commit5403a288a7fae455044d1d937bbf502031915fb4
tree135ff706fed6c59d3af3b35a4f270e18aac0c1f6
parentb3b05a11d31d544025c0400a1c6bc70124300a86
parent8d27bf1cff35be406b0fd89d832e1852d4c573bc
Merge commit '8d27bf1cff35be406b0fd89d832e1852d4c573bc'

* commit '8d27bf1cff35be406b0fd89d832e1852d4c573bc':
  x86: xvid: K&R formatting cosmetics

Conflicts:
libavcodec/x86/xvididct_sse2.c

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