]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '00b160af117b782292619c98effce6c8273792e5'
authorJames Almer <jamrial@gmail.com>
Thu, 28 Sep 2017 16:42:20 +0000 (13:42 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 28 Sep 2017 16:42:20 +0000 (13:42 -0300)
* commit '00b160af117b782292619c98effce6c8273792e5':
  nvenc: Fix nvec vs. nvenc typo

This commit is a noop.

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

Trivial merge