diff options
| author | Max Git <rotvel@gmail.com> | 2020-07-02 23:50:13 +0200 |
|---|---|---|
| committer | Max Git <rotvel@gmail.com> | 2020-07-02 23:50:13 +0200 |
| commit | 3588ee5229b76bca9417813e208e86492e06d609 (patch) | |
| tree | 01131e5776246875ed5a538a71b2bd8a7f1c0c6f /Jellyfin.Server/StartupOptions.cs | |
| parent | 1c84a31b22fa8708ad3c0c901abda4aac903f28d (diff) | |
| parent | 5caddb242beba3cbaa0c1ca94f7fa07f73309ddb (diff) | |
Merge branch 'master' into feature/ffmpeg-version-check
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; } } |