Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1242 from MediaBrowser/master

Browse Source 
merge from master
This commit is contained in:
Luke 2015-10-30 13:06:39 -04:00
commit 967a36d147
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
View File

@ -66,7 +66,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
} }
public HttpListenerHost(IApplicationHost applicationHost, public HttpListenerHost(IApplicationHost applicationHost,
ILogManager logManager, ILogManager logManager,
IServerConfigurationManager config, IServerConfigurationManager config,
string serviceName, string serviceName,
string defaultRedirectPath, params Assembly[] assembliesWithServices) string defaultRedirectPath, params Assembly[] assembliesWithServices)
@ -81,7 +81,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
} }
public string GlobalResponse { get; set; } public string GlobalResponse { get; set; }
public override void Configure(Container container) public override void Configure(Container container)
{ {
HostConfig.Instance.DefaultRedirectPath = DefaultRedirectPath; HostConfig.Instance.DefaultRedirectPath = DefaultRedirectPath;

5
MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegDownloadInfo.cs
View File

@ -126,6 +126,11 @@ namespace MediaBrowser.Server.Startup.Common.FFMpeg
{ {
"https://github.com/MediaBrowser/Emby.Resources/raw/master/ffmpeg/linux/ffmpeg-2.8.0-32bit-static.7z" "https://github.com/MediaBrowser/Emby.Resources/raw/master/ffmpeg/linux/ffmpeg-2.8.0-32bit-static.7z"
}; };
case Architecture.Arm:
return new[]
{
"https://github.com/MediaBrowser/Emby.Resources/raw/master/ffmpeg/linux/ffmpeg-arm.7z"
};
} }
break; break;
} }