michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #169 from joshuaboniface/ffmpeg-timeout

Browse Source 
Restore timeout to 60s as it breaks
This commit is contained in:
Andrew Rabert 2018-12-14 23:38:32 -05:00 committed by GitHub
commit e544a6e265
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Api/ApiEntryPoint.cs
View File

@ -423,12 +423,10 @@ namespace MediaBrowser.Api
var timerDuration = 10000; var timerDuration = 10000;
/*
if (job.Type != TranscodingJobType.Progressive) if (job.Type != TranscodingJobType.Progressive)
{ {
timerDuration = 60000; timerDuration = 60000;
} }
*/
job.PingTimeout = timerDuration; job.PingTimeout = timerDuration;
job.LastPingDate = DateTime.UtcNow; job.LastPingDate = DateTime.UtcNow;