[FFmpeg-cvslog] Merge commit '976f2e0a542e47aaf68ddbe001fb70a00bf96d99' into release/0.10

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Sat Aug  9 19:20:25 2014 +0200| [2c10833d5e4c055033eb89c0e10484919fe251a5] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2c10833d5e4c055033eb89c0e10484919fe251a5
---