diff options
| author | Bond-009 <bond.009@outlook.com> | 2020-07-24 09:40:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-24 09:40:44 +0200 |
| commit | 3ff110984a0a003ab8323482e94557d26f3fec85 (patch) | |
| tree | 8aa4f30696598c4c158bd9286a403d6017b7e612 /MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs | |
| parent | a23292f363c0bae2e9d4dbbf1359234feedd3799 (diff) | |
| parent | f5a3cc654fc8646e633489919b4a8b9e7d3c48fe (diff) | |
Merge branch 'master' into readonlyspan
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs index 0fd0239b4..5c43fdcfa 100644 --- a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs +++ b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs @@ -198,7 +198,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 n?((?:\d+\.?)+)"); + var match = Regex.Match(output, @"^ffmpeg version n?((?:[0-9]+\.?)+)"); if (match.Success) { @@ -225,7 +225,7 @@ namespace MediaBrowser.MediaEncoding.Encoder var rc = new StringBuilder(144); foreach (Match m in Regex.Matches( output, - @"((?<name>lib\w+)\s+(?<major>\d+)\.\s*(?<minor>\d+))", + @"((?<name>lib\w+)\s+(?<major>[0-9]+)\.\s*(?<minor>[0-9]+))", RegexOptions.Multiline)) { rc.Append(m.Groups["name"]) |
