diff options
| author | Neil Burrows <neil.burrows@nvable.com> | 2020-06-29 17:08:20 +0100 |
|---|---|---|
| committer | Neil Burrows <neil.burrows@nvable.com> | 2020-06-29 17:17:28 +0100 |
| commit | 438977350892179d5dc2259316b0fe27ceb1e5da (patch) | |
| tree | f441395880aeff528753303450b0602305c539a6 /Jellyfin.Server/StartupOptions.cs | |
| parent | c39ad25e4ca2a8a8cc6a8e8e626123d27cbfa256 (diff) | |
Respect FFMpeg path passed via Environment Variable
Diffstat (limited to 'Jellyfin.Server/StartupOptions.cs')
| -rw-r--r-- | Jellyfin.Server/StartupOptions.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Jellyfin.Server/StartupOptions.cs b/Jellyfin.Server/StartupOptions.cs index a26114e77..41a1430d2 100644 --- a/Jellyfin.Server/StartupOptions.cs +++ b/Jellyfin.Server/StartupOptions.cs @@ -101,6 +101,11 @@ namespace Jellyfin.Server config.Add(UdpServer.AddressOverrideConfigKey, PublishedServerUrl.ToString()); } + if (FFmpegPath != null) + { + config.Add(ConfigurationExtensions.FfmpegPathKey, FFmpegPath); + } + return config; } } |