aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2013-10-13 11:24:54 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2013-10-13 11:24:54 -0400
commit73aec50dcc112e6ddede55c8ec0b56d9e243644c (patch)
tree976db27caed78e515139ed7b578d2ebae13e2869
parent5ebf30e1935fa5a753e9ab19d7d6fc9dd4f43948 (diff)
updated linux ffmpeg
-rw-r--r--MediaBrowser.Mono.userprefs6
-rw-r--r--MediaBrowser.Server.Mono/FFMpeg/FFMpegDownloadInfo.cs4
2 files changed, 6 insertions, 4 deletions
diff --git a/MediaBrowser.Mono.userprefs b/MediaBrowser.Mono.userprefs
index 3ebeb94d4..c2875801e 100644
--- a/MediaBrowser.Mono.userprefs
+++ b/MediaBrowser.Mono.userprefs
@@ -13,9 +13,11 @@
<Pads>
<Pad Id="ProjectPad">
<State expanded="True">
- <Node name="MediaBrowser.Model" expanded="True" selected="True" />
+ <Node name="MediaBrowser.Model" expanded="True" />
<Node name="MediaBrowser.Server.Mono" expanded="True">
- <Node name="FFMpeg" expanded="True" />
+ <Node name="FFMpeg" expanded="True">
+ <Node name="FFMpegDownloadInfo.cs" selected="True" />
+ </Node>
</Node>
</State>
</Pad>
diff --git a/MediaBrowser.Server.Mono/FFMpeg/FFMpegDownloadInfo.cs b/MediaBrowser.Server.Mono/FFMpeg/FFMpegDownloadInfo.cs
index 3dc5293e0..970e5a3e0 100644
--- a/MediaBrowser.Server.Mono/FFMpeg/FFMpegDownloadInfo.cs
+++ b/MediaBrowser.Server.Mono/FFMpeg/FFMpegDownloadInfo.cs
@@ -7,9 +7,9 @@ namespace MediaBrowser.ServerApplication.FFMpeg
public static string[] FfMpegUrls = new[]
{
- "http://ffmpeg.gusari.org/static/32bit/ffmpeg.static.32bit.2013-09-04.tar.gz",
+ "http://ffmpeg.gusari.org/static/32bit/ffmpeg.static.32bit.2013-10-11.tar.gz",
- "https://www.dropbox.com/s/y7f4nk96rxmbb30/ffmpeg.static.32bit.2013-09-04.tar.gz?dl=1"
+ "https://www.dropbox.com/s/b9v17h105cps7p0/ffmpeg.static.32bit.2013-10-11.tar.gz?dl=1"
};
public static string FFMpegFilename = "ffmpeg";