jellyfin/MediaBrowser.MediaEncoding/Encoder
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
..
EncoderValidator.cs Apply suggestions from code review 2021-12-24 17:03:57 +08:00
EncodingUtils.cs Remove PlayableStreamFileNames as unused 2020-10-01 22:20:34 +02:00
MediaEncoder.cs Merge branch 'master' into keyframe_extraction_v1 2022-01-07 10:23:22 +01:00