aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.ServerApplication/Native/WindowsApp.cs
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2016-05-10 12:21:53 -0400
committerLuke <luke.pulverenti@gmail.com>2016-05-10 12:21:53 -0400
commit21356d10e37fcbe9e3802f3d75a82808985af17c (patch)
treea74f8b26ad7f78562244bd3fc984fbaf91742b76 /MediaBrowser.ServerApplication/Native/WindowsApp.cs
parent21736c6beff233b36d05bb441cf6605b61bf61f8 (diff)
parent673746621f7ed792c41dcd888a5b6e47b17ca2cb (diff)
Merge pull request #1725 from MediaBrowser/dev
fix DeviceDiscovery
Diffstat (limited to 'MediaBrowser.ServerApplication/Native/WindowsApp.cs')
-rw-r--r--MediaBrowser.ServerApplication/Native/WindowsApp.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/MediaBrowser.ServerApplication/Native/WindowsApp.cs b/MediaBrowser.ServerApplication/Native/WindowsApp.cs
index 271b02d9a..f5abcf336 100644
--- a/MediaBrowser.ServerApplication/Native/WindowsApp.cs
+++ b/MediaBrowser.ServerApplication/Native/WindowsApp.cs
@@ -158,7 +158,7 @@ namespace MediaBrowser.ServerApplication.Native
info.FFMpegFilename = "ffmpeg.exe";
info.FFProbeFilename = "ffprobe.exe";
- info.Version = "20160508";
+ info.Version = "20160410";
info.ArchiveType = "7z";
info.IsEmbedded = false;
info.DownloadUrls = GetDownloadUrls();
@@ -214,14 +214,14 @@ namespace MediaBrowser.ServerApplication.Native
case Architecture.X86_X64:
return new[]
{
- "https://github.com/MediaBrowser/Emby.Resources/raw/master/ffmpeg/windows/ffmpeg-20160508-win64.7z",
- "https://ffmpeg.zeranoe.com/builds/win64/static/ffmpeg-20160508-git-caee88d-win64-static.7z"
+ "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-20160508-win32.7z",
- "https://ffmpeg.zeranoe.com/builds/win32/static/ffmpeg-20160508-git-caee88d-win32-static.7z"
+ "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[] { };