[FFmpeg-cvslog] Merge commit '1c6bb813284732d9a1acacfe99522d9f66ebf73e'

[Hendrik Leppkes]

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

Merge commit '1c6bb813284732d9a1acacfe99522d9f66ebf73e'

* commit '1c6bb813284732d9a1acacfe99522d9f66ebf73e':
  x86inc: Disable vpbroadcastq workaround in newer yasm versions

See f151fbd9e58c7af6535efb342d868bf803afef34

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

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