jellyfin/MediaBrowser.MediaEncoding
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-12-27 07:38:06 -07:00
2019-09-28 19:41:34 +02:00
2021-12-27 07:38:06 -07:00