aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaus Vium <cvium@users.noreply.github.com>2021-02-27 19:55:52 +0100
committerJoshua M. Boniface <joshua@boniface.me>2021-02-27 22:30:49 -0500
commite6cc8d50152a49fff63457e24ebc2e7dcff2aeb7 (patch)
tree25be6a3fe89043e7586697fba61c67f3a3f520ab
parentef864e24b9f1d1709db270f0a81e15eb91028665 (diff)
Merge pull request #5073 from BaronGreenback/ffmpeg
Fix for 4933: Alternative ffmpeg fix (cherry picked from commit e5f99762e2d15cfb9e81c92f948a5ee19d128748) Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
-rw-r--r--MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index c0b6cf28b..9c2d383be 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -209,6 +209,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
_ffmpegPath = path;
EncoderLocation = location;
+ return true;
}
else
{