jellyfin/src
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
..
Jellyfin.Extensions Update StyleCop 2021-12-24 18:28:27 +01:00
Jellyfin.MediaEncoding.Hls Implement FfProbeKeyframeExtractor and add tests for it 2021-09-26 21:07:30 +02:00
Jellyfin.MediaEncoding.Keyframes Implement FfProbeKeyframeExtractor and add tests for it 2021-09-26 21:07:30 +02:00