[FFmpeg-cvslog] Merge commit 'b37bfbfbe53917820d1f97312fa0b2e8c7a15217' into release/2.4

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Tue May 19 22:02:26 2015 +0200| [93ceae749b75d315a607db2cf1849762a27a4243] | committer: Michael Niedermayer

Merge commit 'b37bfbfbe53917820d1f97312fa0b2e8c7a15217' into release/2.4

* commit 'b37bfbfbe53917820d1f97312fa0b2e8c7a15217':
  configure: Disable i686 for i586 and lower CPUs

See: cdb3eee7c496f763d195de34be7f67783b98fb2c
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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