Backup_Repos/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-22 19:13:01 +01:00
Code Issues Projects Releases Wiki Activity
jellyfin/MediaBrowser.MediaEncoding/Encoder
History
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
MediaEncoder.cs Merge branch 'master' into keyframe_extraction_v1 2022-01-07 10:23:22 +01:00