-
Michael Niedermayer authored
* commit '503dda7d': dsputil.h: K&R formatting cosmetics Conflicts: libavcodec/dsputil.h Merged-by:
Michael Niedermayer <michaelni@gmx.at>
db94b144
* commit '503dda7d': dsputil.h: K&R formatting cosmetics Conflicts: libavcodec/dsputil.h Merged-by:Michael Niedermayer <michaelni@gmx.at>