Merge commit 'a52976c0feab6e86138983c248bd01fa45cdda69'
authorJames Almer <jamrial@gmail.com>
Wed, 27 Sep 2017 23:29:20 +0000 (20:29 -0300)
committerJames Almer <jamrial@gmail.com>
Wed, 27 Sep 2017 23:29:20 +0000 (20:29 -0300)
commit91feb62b3dbfb49632e69ebc1cb4ffff6a22eac5
tree120a039b2802620d855056253fb48d9d6c5596c2
parentd96363cc8437c9de8fd747068ab331510149810c
parenta52976c0feab6e86138983c248bd01fa45cdda69
Merge commit 'a52976c0feab6e86138983c248bd01fa45cdda69'

* commit 'a52976c0feab6e86138983c248bd01fa45cdda69':
  nvenc: make gpu indices independent of supported capabilities

This commit is a noop, see 5403d90f32656719a766254d77bbe4411e473eed

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