]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit 'b114d28a18050b5ebd22fc067332e5487243889c'
authorHendrik Leppkes <h.leppkes@gmail.com>
Wed, 12 Aug 2015 10:37:01 +0000 (12:37 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Wed, 12 Aug 2015 10:37:01 +0000 (12:37 +0200)
* commit 'b114d28a18050b5ebd22fc067332e5487243889c':
  x86inc: warn when instructions incompatible with current cpuflags are used

See a1684311b3de0766932c42b1ffdd59823d786bc2

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

Trivial merge