Merge pull request #167 from joshuaboniface/ffmpeg-timeout

Lower the ffmpeg stop timeout duration

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;