Merge commit 'd005ccc630e42daab8ec2afecf972d1551a9401a'

Browse Source

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>

...

This commit is contained in:

Derek Buitenhuis

2016-02-16 19:49:51 +00:00

parent 9a9f3f151f d005ccc630

commit fab8d9717c

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available