diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-06-28 22:45:15 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-06-28 22:45:15 -0400 |
| commit | b48ccef62e6a1bbbd37f9f65660aad4b8deb4015 (patch) | |
| tree | ed8b396b6d19437c68ff17079c4e40861e73ec56 | |
| parent | cbf9370f266d0692e47220d0b09a1bc502986fe2 (diff) | |
| parent | 1803a4fc601caa67883fdd5ef172835ebbd18a06 (diff) | |
Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev
| -rw-r--r-- | MediaBrowser.Server.Mac/Native/BaseMonoApp.cs | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs b/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs index 0474018cf..7c9b43026 100644 --- a/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs +++ b/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs @@ -189,11 +189,6 @@ namespace MediaBrowser.Server.Mac { "https://github.com/MediaBrowser/Emby.Resources/raw/master/ffmpeg/osx/ffmpeg-x64-2.8.5.7z" }; - case Architecture.X86: - return new[] - { - "https://github.com/MediaBrowser/Emby.Resources/raw/master/ffmpeg/osx/ffmpeg-x86-2.5.3.7z" - }; } // No version available |