[FFmpeg-cvslog] Merge commit 'f6790b5e1075133ee39be91105f1135db7afd259'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Oct 17 19:11:10 2017 -0300| [8f2cc2f1e9ef7611cbba43fe96f331271b4844fd] | committer: James Almer

Merge commit 'f6790b5e1075133ee39be91105f1135db7afd259'

* commit 'f6790b5e1075133ee39be91105f1135db7afd259':
  add initial QP value options

This commit is a noop, see 5f44a4a0a97e802479e6ce689d719e5277267f22

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

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