[FFmpeg-cvslog] Merge commit 'fb59f87ce72035b940c3f5045884098b9324e1b2'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Fri May 19 11:07:03 2017 +0200| [917853661f955ddabeb0a6d682d03f0b0759f2b7] | committer: Clément Bœsch

Merge commit 'fb59f87ce72035b940c3f5045884098b9324e1b2'

* commit 'fb59f87ce72035b940c3f5045884098b9324e1b2':
  nvenc: Explicitly push the cuda context on encoding

This commit is a noop, see be74ba648cf4063c9805ebe95ee83fd7299f7fd5

Merged-by: Clément Bœsch <u at pkh.me>

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