diff options
| author | Andrew Rabert <6550543+nvllsvm@users.noreply.github.com> | 2018-12-14 23:28:12 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-14 23:28:12 -0500 |
| commit | 72619ddc5aa966c52e68d2d473f0598d687a8296 (patch) | |
| tree | 3fdfaa4754ca63885a750a17f291d001d5b5cf3e | |
| parent | 67aa6dacb2b04ef78c02c55ee058210af405221e (diff) | |
| parent | fda3f0ad9ba93ab44f5754bb9dd3e6b81ccb85af (diff) | |
Merge pull request #168 from joshuaboniface/ffmpeg-timeout
Up the timerDuration back to 10s, 2s is too low
| -rw-r--r-- | MediaBrowser.Api/ApiEntryPoint.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/MediaBrowser.Api/ApiEntryPoint.cs b/MediaBrowser.Api/ApiEntryPoint.cs index ef74aecb2..b3f1923e5 100644 --- a/MediaBrowser.Api/ApiEntryPoint.cs +++ b/MediaBrowser.Api/ApiEntryPoint.cs @@ -421,15 +421,14 @@ namespace MediaBrowser.Api return; } - /* var timerDuration = 10000; + /* if (job.Type != TranscodingJobType.Progressive) { timerDuration = 60000; } */ - var timerDuration = 2000; job.PingTimeout = timerDuration; job.LastPingDate = DateTime.UtcNow; |