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
..
2021-11-20 08:47:05 -07:00
2020-06-25 16:23:31 -06:00
2021-03-11 22:45:58 -07:00
2021-12-24 18:28:27 +01:00
2021-12-24 18:28:27 +01:00
2021-12-24 18:28:27 +01:00
2021-12-24 18:28:27 +01:00
2021-02-22 13:46:40 +01:00