diff options
| author | Andrew Rabert <6550543+nvllsvm@users.noreply.github.com> | 2018-12-14 22:52:39 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-14 22:52:39 -0500 |
| commit | 67aa6dacb2b04ef78c02c55ee058210af405221e (patch) | |
| tree | f54c095e3ba5fe47e66ebf390ec6a5a5b4722aa2 | |
| parent | 46c75d75bd8702da4d3728c11f28756a9c9abb72 (diff) | |
| parent | e5531c5c252522a6d96c9cb6607e96ad65c21eae (diff) | |
Merge pull request #167 from joshuaboniface/ffmpeg-timeout
Lower the ffmpeg stop timeout duration
| -rw-r--r-- | MediaBrowser.Api/ApiEntryPoint.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/MediaBrowser.Api/ApiEntryPoint.cs b/MediaBrowser.Api/ApiEntryPoint.cs index 5aa803b9b..ef74aecb2 100644 --- a/MediaBrowser.Api/ApiEntryPoint.cs +++ b/MediaBrowser.Api/ApiEntryPoint.cs @@ -421,12 +421,15 @@ namespace MediaBrowser.Api return; } + /* var timerDuration = 10000; if (job.Type != TranscodingJobType.Progressive) { timerDuration = 60000; } + */ + var timerDuration = 2000; job.PingTimeout = timerDuration; job.LastPingDate = DateTime.UtcNow; |
