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)
commit4613b4df31f6d5190d76cd1ac0f353e2b4968170
treef87af6e795b25ac80849bdb8e3ad61d35eb746fb
parent98540a2c7d797061ab8f0b61018bb218f94a1215
parent3edac01f79a08635d8d2c08e9410651d9a330d61
Merge commit '3edac01f79a08635d8d2c08e9410651d9a330d61'

* commit '3edac01f79a08635d8d2c08e9410651d9a330d61':
  qsvenc: fix setting maxrate for VBR

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