mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-29 22:00:58 +02:00
Merge commit 'e3e8eab359238486dc233f7aa89b7bb3cb19ec38'
* commit 'e3e8eab359238486dc233f7aa89b7bb3cb19ec38': vaapi_h265: Add support for AUD NAL units vaapi_h265: Convert to use coded bitstream infrastructure vaapi_h264: Add support for SEI recovery points vaapi_h264: Add support for AUD NAL units vaapi_h264: Convert to use coded bitstream infrastructure lavc: Add hevc_metadata bitstream filter lavc: Add h264_redundant_pps bitstream filter lavc: Add h264_metadata bitstream filter lavc: Add trace_headers bitstream filter lavc: Add coded bitstream read/write support for H.265 lavc: Add coded bitstream read/write support for H.264 lavc: Add coded bitstream read/write API pixfmt: Support chroma-derived and ictcp color matrices h264: Add support for alternative transfer characterics SEI vaapi_encode: Move quality option to common code This commit is a noop, see 9c878651dbc8c795894740af74670b591551f619 8c34a2024da77b50470e62789e4859b45959932e f3571048669bf876681499f49e9df492f05f73c6 6734eef6b8b464139fdc140ec9bc9e8d74173869 b4c915f4b3e15c3e787e319b961e4389762f6309 9b0c7aa0e446eceec96ba8f4009e004fad29fba3 9c7d70b49b64aa5571772a7cdb9bc426174261e0 a308872b049e33f69f4b629a06f47e3681906b93 8b26306294ffe78cc73357e2ddd56dd463db50ab 03f982bbca4211108477e772db9a339517ecde37 2e29ca2a9f19ba9a5b189f322f38497d2e2e3db0 281b68b0265953ab2623a39484d927a0e921c405 0bc7575ced65bf4aa4678ac12d550aaf87890d0e 00179664bccd1dd6fa0d1c40db453528757bf6f7 038a51258c4c5d8b77f4f9efcce6f397e5755c24 Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
commit
9249783415