Merge commit 'd8f36a6aa33e9f904fa47caa0329ddaac391cd7d'
authorJames Almer <jamrial@gmail.com>
Wed, 4 Oct 2017 02:03:10 +0000 (23:03 -0300)
committerJames Almer <jamrial@gmail.com>
Wed, 4 Oct 2017 02:03:10 +0000 (23:03 -0300)
commit85fb45586804c2d69c845d145adfc22e35520257
tree85c4f073f5eec6177127ed5d9272310b44cd6519
parente1f01ce8d20bbc53f5d5841fdff125cc04516da9
parentd8f36a6aa33e9f904fa47caa0329ddaac391cd7d
Merge commit 'd8f36a6aa33e9f904fa47caa0329ddaac391cd7d'

* commit 'd8f36a6aa33e9f904fa47caa0329ddaac391cd7d':
  nvenc: Fix the preset mapping list

This commit is a noop.

Merged-by: James Almer <jamrial@gmail.com>