cvium c658a883a2 Merge branch 'master' into keyframe_extraction_v1 ...

# Conflicts:
#	Jellyfin.Api/Controllers/DynamicHlsController.cs
#	MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs
#	MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs

2022-01-07 10:23:22 +01:00

3.9 KiB

Raw Blame History

View Raw