[FFmpeg-cvslog] Merge commit '2fb1d17a5a6b6ff8da2434cde0fda821f06f608c'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Wed Jun 22 19:40:49 2016 +0200| [93f5a27313af2872713b39616c1eb9eb1c3b6415] | committer: Clément Bœsch

Merge commit '2fb1d17a5a6b6ff8da2434cde0fda821f06f608c'

* commit '2fb1d17a5a6b6ff8da2434cde0fda821f06f608c':
  x86inc: Enable AVX emulation in additional cases

This commit is a noop, see e428f3b30cebbc2beafb3ff2972dbf8b47bc4a70

Merged-by: Clément Bœsch <u at pkh.me>

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