starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-18 23:13:06 +03:00
Code Issues Packages Projects Releases Wiki Activity
Files
c658a883a2bc84b46ed73d209d2983e8a324cdce
jellyfin-jellyfin-1/MediaBrowser.Model/Configuration/EncodingOptions.cs
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

3.9 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink