diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-11-29 14:47:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-29 14:47:45 -0500 |
| commit | 8c2095b24ee3228c0e112ebc3cfcb73e146d2a78 (patch) | |
| tree | 6a83c8132f9eac18c0a0bc2461e191c5c725c3c1 /Emby.Server.Core/ApplicationHost.cs | |
| parent | 1d09262963fb1d09f3a04843922a6a7a2f4364b3 (diff) | |
| parent | 456d5e5b760abe46c8dedf08b2465d2bd3ced4af (diff) | |
Merge pull request #2317 from MediaBrowser/dev
Dev
Diffstat (limited to 'Emby.Server.Core/ApplicationHost.cs')
| -rw-r--r-- | Emby.Server.Core/ApplicationHost.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Emby.Server.Core/ApplicationHost.cs b/Emby.Server.Core/ApplicationHost.cs index 90848d930..f7fe02fba 100644 --- a/Emby.Server.Core/ApplicationHost.cs +++ b/Emby.Server.Core/ApplicationHost.cs @@ -789,7 +789,8 @@ namespace Emby.Server.Core MemoryStreamFactory, ProcessFactory, (Environment.ProcessorCount > 2 ? 14000 : 40000), - EnvironmentInfo.OperatingSystem == MediaBrowser.Model.System.OperatingSystem.Windows); + EnvironmentInfo.OperatingSystem == MediaBrowser.Model.System.OperatingSystem.Windows, + EnvironmentInfo); MediaEncoder = mediaEncoder; RegisterSingleInstance(MediaEncoder); |