Merge pull request #1826 from MediaBrowser/dev

Dev

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":

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)
             {