Merge commit '70de2ea4261f860457a04e3d0c58c5543f403325'
authorClément Bœsch <u@pkh.me>
Mon, 20 Mar 2017 21:57:28 +0000 (22:57 +0100)
committerClément Bœsch <u@pkh.me>
Mon, 20 Mar 2017 21:57:28 +0000 (22:57 +0100)
commite849296d0a68f192eb8dc08c22638c0a87b0fd93
treece0aa14de18b3c8745924d2fa88a2927c85d6c3d
parent99d081e6380ef7d894b826b38a261a524d8ea017
parent70de2ea4261f860457a04e3d0c58c5543f403325
Merge commit '70de2ea4261f860457a04e3d0c58c5543f403325'

* commit '70de2ea4261f860457a04e3d0c58c5543f403325':
  nvenc: Extended rate-control support as provided by SDK 7

This commit is a noop, see facc19ef06a753515a3fa604269dd1aa412dc08f

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