-
Michael Niedermayer authored
* commit '619e0da1': dsputil: Remove unused 32-bit functions Conflicts: libavcodec/dsputil.c libavcodec/dsputil_template.c Merged-by:
Michael Niedermayer <michaelni@gmx.at>
f6dcd844
* commit '619e0da1': dsputil: Remove unused 32-bit functions Conflicts: libavcodec/dsputil.c libavcodec/dsputil_template.c Merged-by:Michael Niedermayer <michaelni@gmx.at>