Merge commit 'fb59f87ce72035b940c3f5045884098b9324e1b2'
authorClément Bœsch <u@pkh.me>
Fri, 19 May 2017 09:07:03 +0000 (11:07 +0200)
committerClément Bœsch <u@pkh.me>
Fri, 19 May 2017 09:07:03 +0000 (11:07 +0200)
commit917853661f955ddabeb0a6d682d03f0b0759f2b7
treef9c6cd4a29dc801a7c172ba78131d68ac1f255aa
parentaec4812cb3b35e1ceb68e8cdd15e80e5c91ab768
parentfb59f87ce72035b940c3f5045884098b9324e1b2
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@pkh.me>