diff options
| author | Bond-009 <bond.009@outlook.com> | 2019-04-20 12:25:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-20 12:25:29 +0200 |
| commit | a8da122fb3c9c1f66f43da01099fb6aa86d554c6 (patch) | |
| tree | 12fbf29535844df988492d06420beadab0ac190c /MediaBrowser.MediaEncoding/Encoder | |
| parent | 7bea62adbfc7350c01a222cb92c86c13c0b43412 (diff) | |
| parent | 46c37c0ae8d5b5de02ff6f8208a7b91436f54237 (diff) | |
Merge pull request #1252 from jellyfin/release-10.3.z
Backmerge release 10.3.0
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | 5 |
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)) |