Merge pull request #1242 from MediaBrowser/master

merge from master
9 years ago · 967a36d147
parent 78ebc96600 4d370ff418
commit 967a36d147
2 changed files with 7 additions and 2 deletions
--- 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;
            }