diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-16 19:49:51 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-16 19:50:01 +0000 |
| commit | fab8d9717c9c6fe5aa29e9ef1c43bb70f234b8ba (patch) | |
| tree | 34ddcde617607d17103d1e0f49ed4b03125f62f2 | |
| parent | 9a9f3f151fa2d9cd66fdfdf72722465d11c296bb (diff) | |
| parent | d005ccc630e42daab8ec2afecf972d1551a9401a (diff) | |
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>
0 files changed, 0 insertions, 0 deletions