Merge pull request #1079 from MediaBrowser/dev

3.0.5582.0

1 files changed, 8 insertions, 1 deletions

diff --git a/MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegDownloader.cs b/MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegDownloader.cs
index d4cefdb10..fe7cd943a 100644
--- a/MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegDownloader.cs
+++ b/MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegDownloader.cs
@@ -202,7 +202,14 @@ namespace MediaBrowser.Server.Startup.Common.FFMpeg
                 }
             }
 
-            throw new ApplicationException("Unable to download required components. Please try again later.");
+            if (downloadinfo.DownloadUrls.Length == 0)
+            {
+                throw new ApplicationException("ffmpeg unvailable. Please install it and start the server with two command line arguments: -ffmpeg \"{PATH}\" and -ffprobe \"{PATH}\"");
+            }
+            else
+            {
+                throw new ApplicationException("Unable to download required components. Please try again later.");
+            }
         }
 
         private void ExtractFFMpeg(FFMpegDownloadInfo downloadinfo, string tempFile, string targetFolder)