[FFmpeg-cvslog] Merge commit '257b30af8ec520c1635092e429606c62d3bcca63'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Fri Mar  4 16:21:18 2016 +0000| [61c554bd5feee96bbb3ffe62b37b09c824f9287d] | committer: Derek Buitenhuis

Merge commit '257b30af8ec520c1635092e429606c62d3bcca63'

This commit is a no-op. We already have these, plus our asm differs.

* commit '257b30af8ec520c1635092e429606c62d3bcca63':
  x86: hevc: Fix linking with both yasm and optimizations disabled

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

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