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-09-06 21:15:30 +02:00
2021-12-27 07:38:06 -07:00
2021-12-24 18:28:27 +01:00
2020-09-06 09:07:27 -06:00
2022-01-05 10:58:57 +01:00
2021-12-24 18:28:27 +01:00
2021-02-10 17:09:23 -07:00
2021-12-24 18:28:27 +01:00
2021-11-09 13:14:31 +01:00
2021-12-18 17:17:03 -07:00
2021-12-24 18:28:27 +01:00