Merge pull request #169 from joshuaboniface/ffmpeg-timeout

Restore timeout to 60s as it breaks
6 years ago · e544a6e265
parent 72619ddc5a c3ade725dc
commit e544a6e265
1 changed files with 0 additions and 2 deletions
--- 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;