aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Api/Playback/BaseStreamingService.cs
diff options
context:
space:
mode:
authorSven Van den brande <sven.vandenbrande@outlook.com>2014-11-11 23:15:20 +0100
committerSven Van den brande <sven.vandenbrande@outlook.com>2014-11-11 23:15:20 +0100
commitcbd2c2fc5435aead30513150fc9f50c86eebde49 (patch)
tree01d3a826de7a038acf31788488356980dab60d26 /MediaBrowser.Api/Playback/BaseStreamingService.cs
parent4d0a47e5555e4b04967c679dd4e54e937a0bd7ca (diff)
parent0dfac392e74c0c0688346eedf728eb4d68df68ec (diff)
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Diffstat (limited to 'MediaBrowser.Api/Playback/BaseStreamingService.cs')
-rw-r--r--MediaBrowser.Api/Playback/BaseStreamingService.cs4
1 files changed, 1 insertions, 3 deletions
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index 9c8075bfb..c716ee150 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -995,7 +995,7 @@ namespace MediaBrowser.Api.Playback
if (state.ReadInputAtNativeFramerate)
{
- await Task.Delay(1000, cancellationTokenSource.Token).ConfigureAwait(false);
+ await Task.Delay(1500, cancellationTokenSource.Token).ConfigureAwait(false);
}
}
@@ -1619,8 +1619,6 @@ namespace MediaBrowser.Api.Playback
AttachMediaStreamInfo(state, mediaStreams, videoRequest, url);
- state.SegmentLength = 6;
-
var container = Path.GetExtension(state.RequestedUrl);
if (string.IsNullOrEmpty(container))