]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e3ee67c e02e251)
Merge commit 'e02e2515b24bfc37ede6ca1744696230be55e50b'
authorClément Bœsch <u@pkh.me>
Mon, 20 Mar 2017 21:42:25 +0000 (22:42 +0100)
committerClément Bœsch <u@pkh.me>
Mon, 20 Mar 2017 21:42:25 +0000 (22:42 +0100)
* commit 'e02e2515b24bfc37ede6ca1744696230be55e50b':
  nvenc: Add some easier to understand presets that match x264 terminology

This commit is a noop, see a81b000a392e5c7119d2eddb3f4c90ab9f1e0554 and
faffff88c21c24765e5a3c87ffc657b191c4efc0.

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

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.