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