[FFmpeg-cvslog] Merge commit 'd8f36a6aa33e9f904fa47caa0329ddaac391cd7d'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Oct  3 23:03:10 2017 -0300| [85fb45586804c2d69c845d145adfc22e35520257] | committer: James Almer

Merge commit 'd8f36a6aa33e9f904fa47caa0329ddaac391cd7d'

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

This commit is a noop.

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

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