Merge pull request #168 from joshuaboniface/ffmpeg-timeout

Up the timerDuration back to 10s, 2s is too low
2018-12-14 23:28:12 -05:00 · 2018-12-14 23:28:12 -05:00 · 72619ddc5a
parent 67aa6dacb2 fda3f0ad9b
commit 72619ddc5a
1 changed files with 1 additions and 2 deletions
--- 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;