aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
diff options
context:
space:
mode:
authorBond-009 <bond.009@outlook.com>2020-08-20 16:40:35 +0200
committerGitHub <noreply@github.com>2020-08-20 16:40:35 +0200
commiteda29dbccb3892a44238484b209b0c9895481714 (patch)
tree5fb90ba0ee4d217384d31d1828b6a42a74168a45 /MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
parent250e351613e0eed7977c8cdad4a9078927458feb (diff)
parent5160e627f18fb4a763eaa77b836d20486e55c5e9 (diff)
Merge pull request #3216 from rotvel/feature/ffmpeg-version-check
Try harder at detecting ffmpeg version and enable the validation
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs')
-rw-r--r--MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs3
1 files changed, 0 insertions, 3 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index b9a6432ad..bdf2babfa 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;
}