[FFmpeg-cvslog] Merge commit 'a52976c0feab6e86138983c248bd01fa45cdda69'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Wed Sep 27 20:29:20 2017 -0300| [91feb62b3dbfb49632e69ebc1cb4ffff6a22eac5] | committer: James Almer

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=91feb62b3dbfb49632e69ebc1cb4ffff6a22eac5
---