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