diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-06-17 09:22:31 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-17 09:22:31 -0400 |
| commit | 718981f3f8d2f29db8e58f65e88ca5b1c5d2d966 (patch) | |
| tree | 63b4d69385cd85fb12075a013a57dc93212451cf /MediaBrowser.ServerApplication/Native | |
| parent | 921bd804744bd8419c7e1453583c45150056c6d6 (diff) | |
| parent | aee9d294304679e536a106a68af1f7a7c7db4191 (diff) | |
Merge pull request #1857 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.ServerApplication/Native')
| -rw-r--r-- | MediaBrowser.ServerApplication/Native/WindowsApp.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/MediaBrowser.ServerApplication/Native/WindowsApp.cs b/MediaBrowser.ServerApplication/Native/WindowsApp.cs index c99b0f9af..2ea5064a4 100644 --- a/MediaBrowser.ServerApplication/Native/WindowsApp.cs +++ b/MediaBrowser.ServerApplication/Native/WindowsApp.cs @@ -160,7 +160,6 @@ namespace MediaBrowser.ServerApplication.Native info.FFProbeFilename = "ffprobe.exe"; info.Version = "20160410"; info.ArchiveType = "7z"; - info.IsEmbedded = false; info.DownloadUrls = GetDownloadUrls(); return info; @@ -214,15 +213,17 @@ namespace MediaBrowser.ServerApplication.Native case Architecture.X86_X64: return new[] { + "https://github.com/MediaBrowser/Emby.Resources/raw/master/ffmpeg/windows/ffmpeg-20160410-win64.7z", "https://ffmpeg.zeranoe.com/builds/win64/static/ffmpeg-20160409-git-0c90b2e-win64-static.7z" }; case Architecture.X86: return new[] { + "https://github.com/MediaBrowser/Emby.Resources/raw/master/ffmpeg/windows/ffmpeg-20160410-win32.7z", "https://ffmpeg.zeranoe.com/builds/win32/static/ffmpeg-20160409-git-0c90b2e-win32-static.7z" }; } return new string[] { }; } } -} +}
\ No newline at end of file |