Merge commit '976f2e0a542e47aaf68ddbe001fb70a00bf96d99' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Aug 2014 17:20:25 +0000 (19:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Aug 2014 17:20:25 +0000 (19:20 +0200)
commit2c10833d5e4c055033eb89c0e10484919fe251a5
tree524bd726d2e2a64efb7dca68cf785b7615bc3cda
parentcdfd61b78ba6026b51526661daad6cd708fab352
parent976f2e0a542e47aaf68ddbe001fb70a00bf96d99
Merge commit '976f2e0a542e47aaf68ddbe001fb70a00bf96d99' into release/0.10

* 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>
libavcodec/x86/mpegaudiodec_mmx.c