1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00

Merge commit '956a54129db522998a5abae869568dae2c9774cb'

* commit '956a54129db522998a5abae869568dae2c9774cb':
  vaapi_h264: Set max_num_ref_frames to 1 when not using B frames
  vaapi_encode: Sync to input surface rather than output
  vaapi_encode: Check packed header capabilities
  vaapi_encode: Refactor initialisation

This merge is a noop, see:

ee1d04f970 vaapi_h264: Set max_num_ref_frames to 1 when not using B frames
94f446c628 vaapi_encode: Sync to input surface rather than output
478a4b7e6d vaapi_encode: Check packed header capabilities
c8241e730f vaapi_encode: Refactor initialisation

Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
Clément Bœsch 2017-03-21 14:58:03 +01:00
commit 267cb20e2b

Diff Content Not Available