From 438977350892179d5dc2259316b0fe27ceb1e5da Mon Sep 17 00:00:00 2001
From: Neil Burrows <neil.burrows@nvable.com>
Date: Mon, 29 Jun 2020 17:08:20 +0100
Subject: Respect FFMpeg path passed via Environment Variable

---
 Jellyfin.Server/StartupOptions.cs | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'Jellyfin.Server/StartupOptions.cs')

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;
         }
     }
-- 
cgit v1.2.3