[FFmpeg-cvslog] Merge commit '00b160af117b782292619c98effce6c8273792e5'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Sep 28 13:42:20 2017 -0300| [1a4d2e8b4da73d15721bce30279d16b3690bfbf2] | committer: James Almer

Merge commit '00b160af117b782292619c98effce6c8273792e5'

* commit '00b160af117b782292619c98effce6c8273792e5':
  nvenc: Fix nvec vs. nvenc typo

This commit is a noop.

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

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