diff options
| author | Andreas Rheinhardt <[email protected]> | 2022-01-04 13:43:52 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <[email protected]> | 2022-01-04 14:26:04 +0100 |
| commit | 312060ecfc039421ae8778da4e31a18307348b2b (patch) | |
| tree | bdd29e176bf4b76f50a0138c6c42c53fc32736e7 /libavformat/hls_sample_encryption.h | |
| parent | 311ea9c529117fb8e38abd6ca7e81782b6b21257 (diff) | |
| parent | c512be9a908204d9ac99556b908140b10a2dc13e (diff) | |
Merge branch 'master' into release/5.0
This is necessary to have the recent DOVI additions
in the 5.0 release.
Merged-by: Andreas Rheinhardt <[email protected]>
Signed-off-by: Andreas Rheinhardt <[email protected]>
Diffstat (limited to 'libavformat/hls_sample_encryption.h')
0 files changed, 0 insertions, 0 deletions