Merge commit 'cbd84b8a51aa656d71b7d6ed44bd89041ff081a8'
authorClément Bœsch <u@pkh.me>
Thu, 23 Mar 2017 11:11:05 +0000 (12:11 +0100)
committerClément Bœsch <u@pkh.me>
Thu, 23 Mar 2017 11:11:26 +0000 (12:11 +0100)
commit1b2a7f42c0a0dce84e2c74e93d03f7ef648eb140
tree42bb218708af3f2a9d85dd7b02c49014c3ac9f52
parent464790f109222eb30f794349a1eff32fdf8b5c13
parentcbd84b8a51aa656d71b7d6ed44bd89041ff081a8
Merge commit 'cbd84b8a51aa656d71b7d6ed44bd89041ff081a8'

* commit 'cbd84b8a51aa656d71b7d6ed44bd89041ff081a8':
  nvenc: Fix error log

This commit is a noop, the error message is correct in FFmpeg.

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