Merge commit '7acb9033'

* commit '7acb9033':
  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
b658b539
49ae8a5e
38820631Merged-by: James Almer <jamrial@gmail.com>