pt
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1826 from MediaBrowser/dev 

Dev
This commit is contained in:
Luke 2016-06-07 15:49:19 -04:00
parent 4ec16f9f83 18df678d3f
commit 761837a8e6
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Api/Playback/BaseStreamingService.cs
View File

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

17
MediaBrowser.Server.Startup.Common/ApplicationHost.cs
View File

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