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 /Emby.Server.Implementations/ApplicationHost.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 'Emby.Server.Implementations/ApplicationHost.cs')
| -rw-r--r-- | Emby.Server.Implementations/ApplicationHost.cs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs index 14267b561..18b6834ef 100644 --- a/Emby.Server.Implementations/ApplicationHost.cs +++ b/Emby.Server.Implementations/ApplicationHost.cs @@ -566,10 +566,8 @@ namespace Emby.Server.Implementations serviceCollection.AddTransient(provider => new Lazy<IDtoService>(provider.GetRequiredService<IDtoService>)); // 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>)); |