Merge commit '956a54129db522998a5abae869568dae2c9774cb'
authorClément Bœsch <u@pkh.me>
Tue, 21 Mar 2017 13:58:03 +0000 (14:58 +0100)
committerClément Bœsch <u@pkh.me>
Tue, 21 Mar 2017 13:58:03 +0000 (14:58 +0100)
* 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>

Trivial merge