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-30 22:57:05 -0400
commit6f08e2152fa930b484705718cc3af1c7ed9ed340 (patch)
tree8785395672f5ff9b27f3b3117f7b1e730e1ab3ec
parent043ebd8f1443cf012023f90484687c6da123f651 (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 7a40d5bd1..39f361458 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -1226,7 +1226,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>