diff options
author | Clément Bœsch <u@pkh.me> | 2017-03-21 14:58:03 +0100 |
---|---|---|
committer | Clément Bœsch <u@pkh.me> | 2017-03-21 14:58:03 +0100 |
commit | 267cb20e2bf36074e235449395f570847186c1d9 (patch) | |
tree | 194a24bba3481dcc502ad589b1a64a912de95a25 /Makefile | |
parent | bb7cc5b5d928cbc948881f4f9b8b055129fe0f0b (diff) | |
parent | 956a54129db522998a5abae869568dae2c9774cb (diff) | |
download | ffmpeg-267cb20e2bf36074e235449395f570847186c1d9.tar.gz |
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>
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions