starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-19 15:33:03 +03:00
Code Issues Packages Projects Releases Wiki Activity
Files
d7d36a102aedf1801c8f76a0ead983c5a5a87ccd
jellyfin-jellyfin-1/MediaBrowser.Controller/MediaEncoding/IMediaEncoder.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

7.3 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink