aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhallacy <Dragoonmac@gmail.com>2019-04-04 23:04:54 -0700
committerPhallacy <Dragoonmac@gmail.com>2019-04-09 00:27:41 -0700
commita7e31ef31f0202cefe1fd97a648260c3f4791446 (patch)
treeca4ed26a2a344d3faf69c3acdc56b51931c93f3b
parentf27477da26097ab4cca22c64e5f236150975ff47 (diff)
applied changes to just also search jellyfin base dir
-rw-r--r--MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index 4867c0f85..b626600fa 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -230,6 +230,11 @@ namespace MediaBrowser.MediaEncoding.Encoder
/// <returns></returns>
private string ExistsOnSystemPath(string filename)
{
+ string inJellyfinPath = GetEncoderPathFromDirectory(System.AppContext.BaseDirectory, filename);
+ if (!string.IsNullOrEmpty(inJellyfinPath))
+ {
+ return inJellyfinPath;
+ }
var values = Environment.GetEnvironmentVariable("PATH");
foreach (var path in values.Split(Path.PathSeparator))