[FFmpeg-cvslog] Merge commit 'eafb05fcf37cd19a910ca3b17824384f9006bc0a'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Tue Feb 16 17:02:03 2016 +0000| [8f8381bf03648c583aec1d74e6af406460005ca8] | committer: Derek Buitenhuis

Merge commit 'eafb05fcf37cd19a910ca3b17824384f9006bc0a'

* commit 'eafb05fcf37cd19a910ca3b17824384f9006bc0a':
  v210: x86: Add the correct guards around the asm code

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

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