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 /Emby.Server.Implementations/ApplicationHost.cs | |
| parent | c39ad25e4ca2a8a8cc6a8e8e626123d27cbfa256 (diff) | |
Respect FFMpeg path passed via Environment Variable
Diffstat (limited to 'Emby.Server.Implementations/ApplicationHost.cs')
| -rw-r--r-- | Emby.Server.Implementations/ApplicationHost.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs index 14267b561..8d213ac57 100644 --- a/Emby.Server.Implementations/ApplicationHost.cs +++ b/Emby.Server.Implementations/ApplicationHost.cs @@ -568,8 +568,7 @@ namespace Emby.Server.Implementations // TODO: Refactor to eliminate the circular dependency here so that Lazy<T> isn't required // TODO: Add StartupOptions.FFmpegPath to IConfiguration and remove this custom activation serviceCollection.AddTransient(provider => new Lazy<EncodingHelper>(provider.GetRequiredService<EncodingHelper>)); - serviceCollection.AddSingleton<IMediaEncoder>(provider => - ActivatorUtilities.CreateInstance<MediaBrowser.MediaEncoding.Encoder.MediaEncoder>(provider, _startupOptions.FFmpegPath ?? string.Empty)); + serviceCollection.AddSingleton<IMediaEncoder, MediaBrowser.MediaEncoding.Encoder.MediaEncoder>(); // TODO: Refactor to eliminate the circular dependencies here so that Lazy<T> isn't required serviceCollection.AddTransient(provider => new Lazy<ILibraryMonitor>(provider.GetRequiredService<ILibraryMonitor>)); |