Merge branch 'master' into warn24

2025-12-16 14:03:03 +03:00 · 2020-08-20 18:50:15 +02:00
parent 6123e2e848 8cbefdd561
commit 6292a9e4e9
48 changed files with 492 additions and 381 deletions
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -196,9 +196,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
                        _logger.LogWarning("FFmpeg: {Location}: Failed version check: {Path}", location, path);
                    }

-                    // ToDo - Enable the ffmpeg validator.  At the moment any version can be used.
-                    rc = true;
-
                    _ffmpegPath = path;
                    EncoderLocation = location;
                }