starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-28 19:54:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into bdiso-playback

Browse Source
This commit is contained in:
Stan
2020-10-28 13:18:05 +01:00
committed by GitHub
parent cd4641dca0 be2f27a069
commit 3bb8884e16
309 changed files with 4116 additions and 7046 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs
View File

@@ -69,7 +69,8 @@ namespace MediaBrowser.Controller.MediaEncoding
/// <summary>
/// Extracts the video images on interval.
/// </summary>
Task ExtractVideoImagesOnInterval(string inputFile,
Task ExtractVideoImagesOnInterval(
string inputFile,
string container,
MediaStream videoStream,
MediaSourceInfo mediaSource,