* commit '976f2e0a542e47aaf68ddbe001fb70a00bf96d99': x86: Fix linking with some or all of yasm, mmx, optimizations disabled Conflicts: libavcodec/x86/mpegaudiodec_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>