starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-16 22:13:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

add configurable encoding params

Browse Source
This commit is contained in:
Luke Pulverenti
2016-09-04 11:01:31 -04:00
parent daeedb98ea
commit 9c7eef891b
6 changed files with 46 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
View File

@@ -928,7 +928,12 @@ namespace MediaBrowser.MediaEncoding.Encoder
{
StartProcess(processWrapper);
ranToCompletion = process.WaitForExit(10000);
var timeoutMs = ConfigurationManager.Configuration.ImageExtractionTimeoutMs;
if (timeoutMs <= 0)
{
timeoutMs = 10000;
}
ranToCompletion = process.WaitForExit(timeoutMs);
if (!ranToCompletion)
{