-
Michael Niedermayer authored
* commit 'dc1b328d': x86: hpeldsp: Only compile MMX hpeldsp code if MMX is enabled Conflicts: libavcodec/x86/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
a6e78243
* commit 'dc1b328d': x86: hpeldsp: Only compile MMX hpeldsp code if MMX is enabled Conflicts: libavcodec/x86/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>