diff options
| author | Bond-009 <bond.009@outlook.com> | 2020-08-20 18:50:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-20 18:50:15 +0200 |
| commit | 6292a9e4e91fe98958fb8ab191453c7f713c1c92 (patch) | |
| tree | 00067ebc5a246eb853ef319d073912424cdf3175 /MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | |
| parent | 6123e2e848331548823e80fab80813125db71b96 (diff) | |
| parent | 8cbefdd5614736df4ead5adadc2a95deb45aa326 (diff) | |
Merge branch 'master' into warn24
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs index 7449e4a62..9d01da40f 100644 --- 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; } |