Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev

1 files changed, 2 insertions, 2 deletions

diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index a33a7df8d..6f1edb165 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -148,7 +148,7 @@ namespace MediaBrowser.Api.Playback
         }
 
         protected readonly CultureInfo UsCulture = new CultureInfo("en-US");
-        private readonly long _slowSeekTicks = TimeSpan.FromSeconds(2).Ticks;
+        private readonly long _slowSeekTicks = TimeSpan.FromSeconds(0).Ticks;
 
         /// <summary>
         /// Gets the fast seek command line parameter.
@@ -177,7 +177,7 @@ namespace MediaBrowser.Api.Playback
         {
             var time = request.StartTimeTicks ?? 0;
 
-            if (time > _slowSeekTicks)
+            if (time > _slowSeekTicks && _slowSeekTicks > 0)
             {
                 return string.Format("-ss {0}", MediaEncoder.GetTimeParameter(_slowSeekTicks));
             }