diff --git a/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs b/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs index 0acb45f93c..e322630b6e 100644 --- a/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs +++ b/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs @@ -386,12 +386,14 @@ namespace MediaBrowser.Controller.Providers } } - if (sb.Length == 0) + var stamp = sb.ToString(); + + if (string.IsNullOrEmpty(stamp)) { return Guid.Empty; } - return sb.ToString().GetMD5(); + return stamp.GetMD5(); } private static readonly Dictionary FoldersToMonitor = new[] { "extrafanart", "extrathumbs" } diff --git a/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloadInfo.cs b/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloadInfo.cs index ec7dc582df..fc50df216f 100644 --- a/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloadInfo.cs +++ b/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloadInfo.cs @@ -3,14 +3,12 @@ namespace MediaBrowser.ServerApplication.FFMpeg { public static class FFMpegDownloadInfo { - public static string Version = "ffmpeg20131110.1"; + public static string Version = "ffmpeg20131209"; 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-20131110-git-8cdf4e0-win32-static.7z", - "https://www.dropbox.com/s/5clspc636v9hie6/ffmpeg-20131110-git-8cdf4e0-win32-static.7z?dl=1" + "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" }; public static string FFMpegFilename = "ffmpeg.exe";