aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.ServerApplication
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2014-11-05 20:32:36 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2014-11-05 20:32:36 -0500
commit4ef688e43232ac35e3b5f01a6326970b148567aa (patch)
tree3c297bc2254965ab3b7a19f4ec99e2c4c152e0b5 /MediaBrowser.ServerApplication
parentb5842f9f193959d0d780c9585851c7ea827cc08c (diff)
update osx ffmpeg
Diffstat (limited to 'MediaBrowser.ServerApplication')
-rw-r--r--MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloadInfo.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloadInfo.cs b/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloadInfo.cs
index 01eef25d9a..2ca9107861 100644
--- a/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloadInfo.cs
+++ b/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloadInfo.cs
@@ -47,7 +47,7 @@ namespace MediaBrowser.ServerApplication.FFMpeg
switch (arg)
{
case "Version":
- return "20140827";
+ return "20140923";
case "FFMpegFilename":
return "ffmpeg";
case "FFProbeFilename":
@@ -61,13 +61,13 @@ namespace MediaBrowser.ServerApplication.FFMpeg
switch (arg)
{
case "Version":
- return "20131121";
+ return "20140910";
case "FFMpegFilename":
return "ffmpeg";
case "FFProbeFilename":
return "ffprobe";
case "ArchiveType":
- return "gz";
+ return "7z";
}
}
}
@@ -150,7 +150,7 @@ namespace MediaBrowser.ServerApplication.FFMpeg
{
return new[]
{
- "https://github.com/MediaBrowser/MediaBrowser.Resources/raw/master/ffmpeg/osx/ffmpeg-osx-20131121.gz"
+ "https://github.com/MediaBrowser/MediaBrowser.Resources/raw/master/ffmpeg/osx/ffmpeg-x86-2.4.2.7z"
};
}
@@ -158,7 +158,7 @@ namespace MediaBrowser.ServerApplication.FFMpeg
{
return new[]
{
- "https://github.com/MediaBrowser/MediaBrowser.Resources/raw/master/ffmpeg/osx/ffmpeg-x64-2.3.3.7z"
+ "https://github.com/MediaBrowser/MediaBrowser.Resources/raw/master/ffmpeg/osx/ffmpeg-x64-2.4.1.7z"
};
}