Merge commit '59c90097'

* commit '59c90097':
  hevc: factor out a repeated condition

This commit is a noop. It doesn't apply as our codebase has diverged
too much.
Merged-by: James Almer <jamrial@gmail.com>