Merge commit '7acb90333a187b0e847b66f9d3511245423dc0ce'
authorJames Almer <jamrial@gmail.com>
Mon, 30 Oct 2017 20:02:43 +0000 (17:02 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 30 Oct 2017 20:02:43 +0000 (17:02 -0300)
* commit '7acb90333a187b0e847b66f9d3511245423dc0ce':
  vaapi: Add external control of allow-profile-mismatch
  lavc: Add flag to allow profile mismatch with hardware decoding
  vaapi_encode: Use gop_size consistently in RC parameters

This commit is a noop, see
b658b5399e5d75cec44b09d79b00f59fa83cca43
49ae8a5e87f99b15514f5ef075d801e9ea8374e9
38820631746f86a2252c71ed4a588eb679dd9f40

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

Trivial merge