1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-03 05:10:03 +02:00

Merge commit '7acb90333a187b0e847b66f9d3511245423dc0ce'

* 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
b658b5399e
49ae8a5e87
3882063174

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-10-30 17:02:43 -03:00
commit 623a052628

Diff Content Not Available