[FFmpeg-cvslog] Merge commit '3df77b58e35a30ed550f99936a308f6bd2f47a20'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Oct 21 14:16:44 2017 -0300| [2c966481091af762751d36a37695e23b80106710] | committer: James Almer

Merge commit '3df77b58e35a30ed550f99936a308f6bd2f47a20'

* commit '3df77b58e35a30ed550f99936a308f6bd2f47a20':
  nvenc: Allow different const qps for I, P and B frames

This commit is a noop, see 2db5ab73d43a8c22616e686ab12f94223910c761

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

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