diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-02-16 12:16:32 -0500 |
|---|---|---|
| committer | Luke <luke.pulverenti@gmail.com> | 2016-02-16 12:16:32 -0500 |
| commit | 25a3207543877fc2ff0633ebe2cfa2d29d5ff9d3 (patch) | |
| tree | 418cf9fd3bd2cf8821e5b340620fb9fb41a5633a /MediaBrowser.Server.Startup.Common | |
| parent | ea837903052339818336a3c677c0660cb3c15c33 (diff) | |
| parent | cc98b04c5d773ba7df480136ab53f0fef67e09c7 (diff) | |
Merge pull request #1468 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Server.Startup.Common')
| -rw-r--r-- | MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegDownloadInfo.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegDownloadInfo.cs b/MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegDownloadInfo.cs index 3b83e65b2..60cb50e30 100644 --- a/MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegDownloadInfo.cs +++ b/MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegDownloadInfo.cs @@ -33,7 +33,7 @@ namespace MediaBrowser.Server.Startup.Common.FFMpeg case OperatingSystem.Linux: info.ArchiveType = "7z"; - info.Version = "20150917"; + info.Version = "20160215"; break; case OperatingSystem.Osx: @@ -119,12 +119,12 @@ namespace MediaBrowser.Server.Startup.Common.FFMpeg case Architecture.X86_X64: return new[] { - "https://github.com/MediaBrowser/Emby.Resources/raw/master/ffmpeg/linux/ffmpeg-2.8.0-64bit-static.7z" + "https://github.com/MediaBrowser/Emby.Resources/raw/master/ffmpeg/linux/ffmpeg-git-20160215-64bit-static.7z" }; case Architecture.X86: return new[] { - "https://github.com/MediaBrowser/Emby.Resources/raw/master/ffmpeg/linux/ffmpeg-2.8.0-32bit-static.7z" + "https://github.com/MediaBrowser/Emby.Resources/raw/master/ffmpeg/linux/ffmpeg-git-20160215-32bit-static.7z" }; case Architecture.Arm: return new[] |