diff options
| author | Andrew Rabert <6550543+nvllsvm@users.noreply.github.com> | 2018-12-14 23:38:32 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-14 23:38:32 -0500 |
| commit | e544a6e2656161b8f560df047ccd0f6e30f74326 (patch) | |
| tree | dd6a198e3c104ebc732a615153c4bb5514e25660 | |
| parent | 72619ddc5aa966c52e68d2d473f0598d687a8296 (diff) | |
| parent | c3ade725dc8f863be91a743f68a4a2fd2bf3f911 (diff) | |
Merge pull request #169 from joshuaboniface/ffmpeg-timeout
Restore timeout to 60s as it breaks
| -rw-r--r-- | MediaBrowser.Api/ApiEntryPoint.cs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/MediaBrowser.Api/ApiEntryPoint.cs b/MediaBrowser.Api/ApiEntryPoint.cs index b3f1923e5b..5aa803b9b6 100644 --- a/MediaBrowser.Api/ApiEntryPoint.cs +++ b/MediaBrowser.Api/ApiEntryPoint.cs @@ -423,12 +423,10 @@ namespace MediaBrowser.Api var timerDuration = 10000; - /* if (job.Type != TranscodingJobType.Progressive) { timerDuration = 60000; } - */ job.PingTimeout = timerDuration; job.LastPingDate = DateTime.UtcNow; |