Merge commit 'ca62236a89f47bd871eaf69d8d9e837c93c55a6c'
authorJames Almer <jamrial@gmail.com>
Tue, 26 Sep 2017 17:43:29 +0000 (14:43 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 26 Sep 2017 17:43:29 +0000 (14:43 -0300)
* commit 'ca62236a89f47bd871eaf69d8d9e837c93c55a6c':
  vaapi_encode: Add VP8 support
  vaapi_encode: Pass framerate parameters to driver
  vaapi_h264: Enable VBR mode
  vaapi_encode: Support VBR mode

This commit is a noop, see
ceb28c3cc4c7921935b48904db3c559eed1597fe
2201c02e6dc9f9652a8e27dec194915f05954ad0
be6546a4ff592785d039df6cbdd7659781d30b2c
d1acab8293054151157910eb081d5edcc7496e13

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

Trivial merge