diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-07-03 20:25:56 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-07-03 20:25:56 -0400 |
| commit | ad70469f82419a8a673eed99e4512a1f6456ff70 (patch) | |
| tree | badf7d664ce7a7bb8db854b1061d8fde33f07318 /MediaBrowser.Server.Startup.Common/ApplicationHost.cs | |
| parent | 598aeb198882b5d6f5c533664536028465b31619 (diff) | |
| parent | e1bdca9f1f7a597513ea15d3969c6ea40f440292 (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/Emby
Diffstat (limited to 'MediaBrowser.Server.Startup.Common/ApplicationHost.cs')
| -rw-r--r-- | MediaBrowser.Server.Startup.Common/ApplicationHost.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs index 63bdddac99..bcd2ed8bd8 100644 --- a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs +++ b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs @@ -660,7 +660,9 @@ namespace MediaBrowser.Server.Startup.Common ChannelManager, SessionManager, () => SubtitleEncoder, - () => MediaSourceManager); + () => MediaSourceManager, + HttpClient, + ZipClient); MediaEncoder = mediaEncoder; RegisterSingleInstance(MediaEncoder); |