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)
commita5dea2b77305798834295ce4396c462ac775c29c
treece0aa14de18b3c8745924d2fa88a2927c85d6c3d
parente3ee67c85e697fe06be3b6c6f9a05694c6b3bcf0
parente02e2515b24bfc37ede6ca1744696230be55e50b
Merge commit 'e02e2515b24bfc37ede6ca1744696230be55e50b'

* 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>