Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

updated ffmpeg

Browse Source
This commit is contained in:
Luke Pulverenti 2013-12-09 22:33:49 -05:00
parent e23efc9a84
commit 503e01e6fa
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MediaBrowser.Controller/Providers/BaseMetadataProvider.cs
View File

@ -386,12 +386,14 @@ namespace MediaBrowser.Controller.Providers
} }
} }
if (sb.Length == 0) var stamp = sb.ToString();
if (string.IsNullOrEmpty(stamp))
{ {
return Guid.Empty; return Guid.Empty;
} }
return sb.ToString().GetMD5(); return stamp.GetMD5();
} }
private static readonly Dictionary<string, string> FoldersToMonitor = new[] { "extrafanart", "extrathumbs" } private static readonly Dictionary<string, string> FoldersToMonitor = new[] { "extrafanart", "extrathumbs" }

8
MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloadInfo.cs
View File

@ -3,14 +3,12 @@ namespace MediaBrowser.ServerApplication.FFMpeg
{ {
public static class FFMpegDownloadInfo public static class FFMpegDownloadInfo
{ {
public static string Version = "ffmpeg20131110.1"; public static string Version = "ffmpeg20131209";
public static string[] FfMpegUrls = new[] public static string[] FfMpegUrls = new[]
{ {
"https://github.com/MediaBrowser/MediaBrowser.Resources/raw/master/ffmpeg/windows/ffmpeg-20131110-git-8cdf4e0-win32-static.7z", "http://ffmpeg.zeranoe.com/builds/win32/static/ffmpeg-20131209-git-a12f679-win32-static.7z",
"https://www.dropbox.com/s/d38uj7857trbw1g/ffmpeg-20131209-git-a12f679-win32-static.7z?dl=1"
"http://ffmpeg.zeranoe.com/builds/win32/static/ffmpeg-20131110-git-8cdf4e0-win32-static.7z",
"https://www.dropbox.com/s/5clspc636v9hie6/ffmpeg-20131110-git-8cdf4e0-win32-static.7z?dl=1"
}; };
public static string FFMpegFilename = "ffmpeg.exe"; public static string FFMpegFilename = "ffmpeg.exe";