From 168587b2a0d1f495a9f85e05b1e518f615b0cfcc Mon Sep 17 00:00:00 2001
From: Sven Van den brande <sven.vandenbrande@outlook.com>
Date: Sun, 27 Mar 2016 23:11:27 +0200
Subject: Remove unused code...

---
 MediaBrowser.Api/ApiEntryPoint.cs | 1 -
 1 file changed, 1 deletion(-)

(limited to 'MediaBrowser.Api/ApiEntryPoint.cs')

diff --git a/MediaBrowser.Api/ApiEntryPoint.cs b/MediaBrowser.Api/ApiEntryPoint.cs
index 117ff2305..8233717ab 100644
--- a/MediaBrowser.Api/ApiEntryPoint.cs
+++ b/MediaBrowser.Api/ApiEntryPoint.cs
@@ -1,6 +1,5 @@
 using MediaBrowser.Api.Playback;
 using MediaBrowser.Common.Configuration;
-using MediaBrowser.Common.IO;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Plugins;
-- 
cgit v1.2.3


From ab2a29187074b518a06b3bb4d6467d73ca616110 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 29 Mar 2016 00:26:25 -0400
Subject: update hls stop

---
 MediaBrowser.Api/ApiEntryPoint.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'MediaBrowser.Api/ApiEntryPoint.cs')

diff --git a/MediaBrowser.Api/ApiEntryPoint.cs b/MediaBrowser.Api/ApiEntryPoint.cs
index 8233717ab..66ca8c25d 100644
--- a/MediaBrowser.Api/ApiEntryPoint.cs
+++ b/MediaBrowser.Api/ApiEntryPoint.cs
@@ -349,7 +349,7 @@ namespace MediaBrowser.Api
 
             if (job.Type != TranscodingJobType.Progressive)
             {
-                timerDuration = 1800000;
+                timerDuration = 60000;
             }
 
             job.PingTimeout = timerDuration;
-- 
cgit v1.2.3