projects / ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: e1f01ce d8f36a6)
Merge commit 'd8f36a6aa33e9f904fa47caa0329ddaac391cd7d'
authorJames Almer <jamrial@gmail.com>
Wed, 4 Oct 2017 02:03:10 +0000 (23:03 -0300)
committerJames Almer <jamrial@gmail.com>
Wed, 4 Oct 2017 02:03:10 +0000 (23:03 -0300)
* commit 'd8f36a6aa33e9f904fa47caa0329ddaac391cd7d':
  nvenc: Fix the preset mapping list

This commit is a noop.

Merged-by: James Almer <jamrial@gmail.com>

Trivial merge
FFmpeg git repo