[FFmpeg-cvslog] Merge commit '8c75ba55a4367c854b577c849ea2195bd78c4c81'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Wed Aug 12 12:35:41 2015 +0200| [eaf3fb877f81ac819b92e742cb8a76b8b1629978] | committer: Hendrik Leppkes

Merge commit '8c75ba55a4367c854b577c849ea2195bd78c4c81'

* commit '8c75ba55a4367c854b577c849ea2195bd78c4c81':
  x86inc: warn if XOP integer FMA instruction emulation is impossible

See 8db0f71b49a360dd64ae482fa4244db055f117eb

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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