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