starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-18 15:03:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix ffmpeg version check for unknown versions

Browse Source
This commit is contained in:
Bond_009
2019-09-29 13:41:24 +02:00
parent 61f2c41b76
commit 3e1aab6b29
3 changed files with 41 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
View File

@@ -118,15 +118,18 @@ namespace MediaBrowser.MediaEncoding.Encoder
_logger.LogInformation("Found ffmpeg version {0}", version != null ? version.ToString() : "unknown");
if (version == null && MinVersion != null && MaxVersion != null) // Version is unknown
if (version == null)
{
if (MinVersion == MaxVersion)
if (MinVersion != null && MaxVersion != null) // Version is unknown
{
_logger.LogWarning("FFmpeg validation: We recommend ffmpeg version {0}", MinVersion);
}
else
{
_logger.LogWarning("FFmpeg validation: We recommend a minimum of {0} and maximum of {1}", MinVersion, MaxVersion);
if (MinVersion == MaxVersion)
{
_logger.LogWarning("FFmpeg validation: We recommend ffmpeg version {0}", MinVersion);
}
else
{
_logger.LogWarning("FFmpeg validation: We recommend a minimum of {0} and maximum of {1}", MinVersion, MaxVersion);
}
}
return false;
@@ -161,7 +164,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
internal static Version GetFFmpegVersion(string output)
{
// For pre-built binaries the FFmpeg version should be mentioned at the very start of the output
var match = Regex.Match(output, @"ffmpeg version ((?:\d+\.?)+)");
var match = Regex.Match(output, @"^ffmpeg version n?((?:\d+\.?)+)");
if (match.Success)
{