]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '3edac01f79a08635d8d2c08e9410651d9a330d61'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 22 Nov 2015 17:47:21 +0000 (17:47 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 22 Nov 2015 17:47:21 +0000 (17:47 +0000)
* commit '3edac01f79a08635d8d2c08e9410651d9a330d61':
  qsvenc: fix setting maxrate for VBR

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Trivial merge