projects / ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 464790f cbd84b8)
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)
* 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>

Trivial merge
FFmpeg git repo