Merge commit '257b30af'

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

* commit '257b30af':
  x86: hevc: Fix linking with both yasm and optimizations disabled
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>