* commit '2b379a925162b6783bd9a81dc03e647e8b65494c': mlpdsp: x86: Respect cpuflags Conflicts: libavcodec/x86/mlpdsp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>