diff options
| author | Joshua M. Boniface <joshua@boniface.me> | 2019-04-09 23:57:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-09 23:57:20 -0400 |
| commit | 007fe3436336087bb8fe26b00e9895b9dc0427e5 (patch) | |
| tree | f7493a0034bba80442b1820bd13b878a9886e5c4 /MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | |
| parent | eae0c28e6da1618e033ae059a06d8364e649450a (diff) | |
| parent | a7e31ef31f0202cefe1fd97a648260c3f4791446 (diff) | |
Merge pull request #1221 from LogicalPhallacy/ffmpegdetection
Make Jellyfin search its base dir for ffmpeg
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs')
| -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)) |