Merge commit 'f6790b5e1075133ee39be91105f1135db7afd259'
authorJames Almer <jamrial@gmail.com>
Tue, 17 Oct 2017 22:11:10 +0000 (19:11 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 17 Oct 2017 22:11:10 +0000 (19:11 -0300)
commit8f2cc2f1e9ef7611cbba43fe96f331271b4844fd
treef62013ed7472376f80caa458873d9071ad118fc9
parenta41a5733d1a439d4920fff6239c2ebaafa338123
parentf6790b5e1075133ee39be91105f1135db7afd259
Merge commit 'f6790b5e1075133ee39be91105f1135db7afd259'

* commit 'f6790b5e1075133ee39be91105f1135db7afd259':
  add initial QP value options

This commit is a noop, see 5f44a4a0a97e802479e6ce689d719e5277267f22

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