[FFmpeg-cvslog] Merge commit 'ca62236a89f47bd871eaf69d8d9e837c93c55a6c'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Sep 26 14:43:29 2017 -0300| [efc4b3e9d702a5960affd0d65abe02405715d5c5] | committer: James Almer

Merge commit 'ca62236a89f47bd871eaf69d8d9e837c93c55a6c'

* 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 at gmail.com>

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