mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-11-15 18:08:53 -07:00
Merge pull request #169 from joshuaboniface/ffmpeg-timeout
Restore timeout to 60s as it breaks
This commit is contained in:
commit
e544a6e265
@ -423,12 +423,10 @@ namespace MediaBrowser.Api
|
||||
|
||||
var timerDuration = 10000;
|
||||
|
||||
/*
|
||||
if (job.Type != TranscodingJobType.Progressive)
|
||||
{
|
||||
timerDuration = 60000;
|
||||
}
|
||||
*/
|
||||
|
||||
job.PingTimeout = timerDuration;
|
||||
job.LastPingDate = DateTime.UtcNow;
|
||||
|
Loading…
Reference in New Issue
Block a user