-
Michael Niedermayer authored
* commit '8199bb7b': dsputil.h: Clean up comments Conflicts: libavcodec/dsputil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
153557df
* commit '8199bb7b': dsputil.h: Clean up comments Conflicts: libavcodec/dsputil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>