diff options
| author | Anthony Lavado <anthony@lavado.ca> | 2020-06-30 11:21:17 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-30 11:21:17 -0700 |
| commit | 72aa0bb1ad1c82bcf0ae0e5caef4be17696c09b0 (patch) | |
| tree | 8dc4be2e38e90961772bbc3285b3dec2974cf015 /Jellyfin.Server/StartupOptions.cs | |
| parent | 92e7cc8f77c5e8c3e5bb5262931d6cfd5d5017a3 (diff) | |
| parent | 6b532b3da56a3f7fa0ef920a1f14ba8db70bcb35 (diff) | |
Merge pull request #3480 from neilsb/ffmpeg-env-var
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; } } |