Merge commit 'd005ccc6'

This commit is a no-op. Ours should be superior.

* commit 'd005ccc6':
  nvenc: rename a misnamed function
  nvenc: merge input and output surface structs
  nvenc: factor out the pixel format list
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>