[FFmpeg-cvslog] Merge commit 'b114d28a18050b5ebd22fc067332e5487243889c'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Wed Aug 12 12:37:01 2015 +0200| [30cd9695a7ed6e096234502b7388ef3433100fc9] | committer: Hendrik Leppkes

Merge commit 'b114d28a18050b5ebd22fc067332e5487243889c'

* commit 'b114d28a18050b5ebd22fc067332e5487243889c':
  x86inc: warn when instructions incompatible with current cpuflags are used

See a1684311b3de0766932c42b1ffdd59823d786bc2

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

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