aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.ServerApplication
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2014-08-27 21:27:46 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2014-08-27 21:27:46 -0400
commit93ded925a7670b698c2f80a3027644a0e2b183f1 (patch)
tree94769eaeb1d2b4d5ddd81a2d9448d97383688601 /MediaBrowser.ServerApplication
parent809e4629c09821e7373bff79e0d0be86df11ce2c (diff)
Fixes #901 - Improve captured photo metadata
Diffstat (limited to 'MediaBrowser.ServerApplication')
-rw-r--r--MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloadInfo.cs13
1 files changed, 11 insertions, 2 deletions
diff --git a/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloadInfo.cs b/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloadInfo.cs
index 97a3ee190..7a74e9689 100644
--- a/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloadInfo.cs
+++ b/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloadInfo.cs
@@ -35,7 +35,7 @@ namespace MediaBrowser.ServerApplication.FFMpeg
switch (arg)
{
case "Version":
- return "20140612";
+ return "20140827";
case "FFMpegFilename":
return "ffmpeg.exe";
case "FFProbeFilename":
@@ -111,9 +111,18 @@ namespace MediaBrowser.ServerApplication.FFMpeg
switch (pid)
{
case PlatformID.Win32NT:
+ if (PlatformDetection.IsX86_64)
+ {
+ return new[]
+ {
+ "http://ffmpeg.zeranoe.com/builds/win64/static/ffmpeg-20140827-git-9e8ab36-win64-static.7z",
+ "https://github.com/MediaBrowser/MediaBrowser.Resources/raw/master/ffmpeg/windows/ffmpeg-20140612-git-3a1c895-win32-static.7z"
+ };
+ }
+
return new[]
{
- "http://ffmpeg.zeranoe.com/builds/win32/static/ffmpeg-20140612-git-3a1c895-win32-static.7z",
+ "http://ffmpeg.zeranoe.com/builds/win32/static/ffmpeg-20140827-git-9e8ab36-win32-static.7z",
"https://github.com/MediaBrowser/MediaBrowser.Resources/raw/master/ffmpeg/windows/ffmpeg-20140612-git-3a1c895-win32-static.7z"
};