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@gmail.com>