[FFmpeg-cvslog] Merge commit '352741b5ead1543d775ccf6040f33023e4491186'

[Clément Bœsch]

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

Merge commit '352741b5ead1543d775ccf6040f33023e4491186'

* commit '352741b5ead1543d775ccf6040f33023e4491186':
  nvenc: Make sure that enum and array index match

This commit is a noop, see a81b000a392e5c7119d2eddb3f4c90ab9f1e0554

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

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