aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2015-03-31 15:41:12 -0400
committerLuke <luke.pulverenti@gmail.com>2015-03-31 15:41:12 -0400
commitbe74de0236a3544959722b3a8ff9c9ca26c73d13 (patch)
tree292d0abda239cd3966840b7e93568580209bf189 /MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
parentaa079120059699f4778d80f55e68883d75d26b3a (diff)
parent2626b6f3729097e083f381936738d17335f48f1c (diff)
Merge pull request #1058 from MediaBrowser/dev
3.0.5569.0
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs')
-rw-r--r--MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs4
1 files changed, 0 insertions, 4 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index 7fd91bf6f..425889807 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -577,10 +577,8 @@ namespace MediaBrowser.MediaEncoding.Encoder
_logger,
ConfigurationManager,
FileSystem,
- LiveTvManager,
IsoManager,
LibraryManager,
- ChannelManager,
SessionManager,
SubtitleEncoder(),
MediaSourceManager())
@@ -599,10 +597,8 @@ namespace MediaBrowser.MediaEncoding.Encoder
_logger,
ConfigurationManager,
FileSystem,
- LiveTvManager,
IsoManager,
LibraryManager,
- ChannelManager,
SessionManager,
SubtitleEncoder(),
MediaSourceManager())