diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-06-07 15:49:19 -0400 |
|---|---|---|
| committer | Luke <luke.pulverenti@gmail.com> | 2016-06-07 15:49:19 -0400 |
| commit | 761837a8e6804076593afed354e5ea8a025be49f (patch) | |
| tree | e3b88ccb81afb6767a0dcdbe0a9f9f873be1c213 | |
| parent | 4ec16f9f834004403b5e15c474feda547bd67060 (diff) | |
| parent | 18df678d3f18bd710aa65fa315f4006a78415fbc (diff) | |
Merge pull request #1826 from MediaBrowser/dev
Dev
| -rw-r--r-- | MediaBrowser.Api/Playback/BaseStreamingService.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Server.Startup.Common/ApplicationHost.cs | 17 |
2 files changed, 17 insertions, 2 deletions
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs index f2357ba8a..0cfb58b2e 100644 --- a/MediaBrowser.Api/Playback/BaseStreamingService.cs +++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs @@ -846,7 +846,7 @@ namespace MediaBrowser.Api.Playback if (MediaEncoder.SupportsDecoder("h264_qsv")) { // Seeing stalls and failures with decoding. Not worth it compared to encoding. - //return "-c:v h264_qsv "; + return "-c:v h264_qsv "; } break; case "mpeg2video": diff --git a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs index 23710479b..9acb3bea2 100644 --- a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs +++ b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs @@ -831,9 +831,24 @@ namespace MediaBrowser.Server.Startup.Common private string CertificatePath { get; set; } + private string NormalizeConfiguredLocalAddress(string address) + { + var index = address.Trim('/').IndexOf('/'); + + if (index != -1) + { + address = address.Substring(index + 1); + } + + return address.Trim('/'); + } private IEnumerable<string> GetUrlPrefixes() { - var hosts = ServerConfigurationManager.Configuration.LocalNetworkAddresses.ToList(); + var hosts = ServerConfigurationManager + .Configuration + .LocalNetworkAddresses + .Select(NormalizeConfiguredLocalAddress) + .ToList(); if (hosts.Count == 0) { |