[FFmpeg-cvslog] Merge commit 'e02e2515b24bfc37ede6ca1744696230be55e50b'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Mon Mar 20 22:42:25 2017 +0100| [a5dea2b77305798834295ce4396c462ac775c29c] | committer: Clément Bœsch

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 at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a5dea2b77305798834295ce4396c462ac775c29c
---