Merge pull request #168 from joshuaboniface/ffmpeg-timeout

Up the timerDuration back to 10s, 2s is too low

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;