]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '1c6bb813284732d9a1acacfe99522d9f66ebf73e'
authorHendrik Leppkes <h.leppkes@gmail.com>
Wed, 12 Aug 2015 10:37:44 +0000 (12:37 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Wed, 12 Aug 2015 10:37:44 +0000 (12:37 +0200)
* commit '1c6bb813284732d9a1acacfe99522d9f66ebf73e':
  x86inc: Disable vpbroadcastq workaround in newer yasm versions

See f151fbd9e58c7af6535efb342d868bf803afef34

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

Trivial merge