diff options
| author | Luke <luke.pulverenti@gmail.com> | 2015-10-30 13:06:39 -0400 |
|---|---|---|
| committer | Luke <luke.pulverenti@gmail.com> | 2015-10-30 13:06:39 -0400 |
| commit | 967a36d1478f72540b840d1c1db3e4e391875251 (patch) | |
| tree | f4526400db0665dbe970304c1f71209977fb6b64 | |
| parent | 78ebc966003f9b6114cd3bd9969d719a9e88b698 (diff) | |
| parent | 4d370ff418d6e901777bfb036e9a0cd708ed3e9c (diff) | |
Merge pull request #1242 from MediaBrowser/master
merge from master
| -rw-r--r-- | MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs | 4 | ||||
| -rw-r--r-- | MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegDownloadInfo.cs | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs index e8ed916157..1ac47016da 100644 --- a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs +++ b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs @@ -66,7 +66,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer } public HttpListenerHost(IApplicationHost applicationHost, - ILogManager logManager, + ILogManager logManager, IServerConfigurationManager config, string serviceName, string defaultRedirectPath, params Assembly[] assembliesWithServices) @@ -81,7 +81,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer } public string GlobalResponse { get; set; } - + public override void Configure(Container container) { HostConfig.Instance.DefaultRedirectPath = DefaultRedirectPath; diff --git a/MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegDownloadInfo.cs b/MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegDownloadInfo.cs index 42fc734886..b4d2e5b851 100644 --- a/MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegDownloadInfo.cs +++ b/MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegDownloadInfo.cs @@ -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" }; + case Architecture.Arm: + return new[] + { + "https://github.com/MediaBrowser/Emby.Resources/raw/master/ffmpeg/linux/ffmpeg-arm.7z" + }; } break; } |