Merge commit '3df77b58e35a30ed550f99936a308f6bd2f47a20'
authorJames Almer <jamrial@gmail.com>
Sat, 21 Oct 2017 17:16:44 +0000 (14:16 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 21 Oct 2017 17:16:44 +0000 (14:16 -0300)
commit2c966481091af762751d36a37695e23b80106710
treeb8e2afe61f300cf2668a5b5525732bb47cbd7e47
parent12b6166bcfb4fbdbc8b1e3a26a64c4ee8aa0e700
parent3df77b58e35a30ed550f99936a308f6bd2f47a20
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@gmail.com>