aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2016-09-23 01:45:14 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2016-09-23 01:45:14 -0400
commitb4bc4037471dea55a679e1be24a202906b1e8f4d (patch)
treeee2500099934369b31256b51e79d63923954cc8b
parent35acc01e03d6cef73483c2065345e4ac2a4ebdba (diff)
fix EnableThrottling override
-rw-r--r--MediaBrowser.Api/Playback/BaseStreamingService.cs2
-rw-r--r--MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs5
2 files changed, 1 insertions, 6 deletions
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index 7ef9a1d5b..371247ecd 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -1241,7 +1241,7 @@ namespace MediaBrowser.Api.Playback
}
}
- protected virtual bool EnableThrottling(StreamState state)
+ private bool EnableThrottling(StreamState state)
{
// do not use throttling with hardware encoders
return state.InputProtocol == MediaProtocol.File &&
diff --git a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
index 7de309699..9cd55528d 100644
--- a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
+++ b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
@@ -922,11 +922,6 @@ namespace MediaBrowser.Api.Playback.Hls
).Trim();
}
- protected override bool EnableThrottling(StreamState state)
- {
- return true;
- }
-
/// <summary>
/// Gets the segment file extension.
/// </summary>