[FFmpeg-cvslog] Merge commit 'ba3eb745cc236765c916b74b39c1874da5c3aefc'

[Clément Bœsch]

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

Merge commit 'ba3eb745cc236765c916b74b39c1874da5c3aefc'

* commit 'ba3eb745cc236765c916b74b39c1874da5c3aefc':
  x86inc: Fix AVX emulation of scalar float instructions

This commit is a noop, see 8dd3ee9dddcaf1d538252d77dd2af3ea139f4f96

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

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