Merge commit 'd005ccc630e42daab8ec2afecf972d1551a9401a'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 16 Feb 2016 19:49:51 +0000 (19:49 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 16 Feb 2016 19:50:01 +0000 (19:50 +0000)
commitfab8d9717c9c6fe5aa29e9ef1c43bb70f234b8ba
tree34ddcde617607d17103d1e0f49ed4b03125f62f2
parent9a9f3f151fa2d9cd66fdfdf72722465d11c296bb
parentd005ccc630e42daab8ec2afecf972d1551a9401a
Merge commit 'd005ccc630e42daab8ec2afecf972d1551a9401a'

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

* commit 'd005ccc630e42daab8ec2afecf972d1551a9401a':
  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>