Merge pull request #1242 from MediaBrowser/master

merge from master

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;

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;
             }