diff options
| author | LukePulverenti <luke.pulverenti@gmail.com> | 2013-02-23 10:32:54 -0500 |
|---|---|---|
| committer | LukePulverenti <luke.pulverenti@gmail.com> | 2013-02-23 10:32:54 -0500 |
| commit | 33ed929b526acbda696f00f5966917ebd6a9ded2 (patch) | |
| tree | 18e75812ce71274a3e02f800536e8c144f4e5c45 /MediaBrowser.Api/Streaming/VideoHandler.cs | |
| parent | 02634588710f65ce952d0229d7da6b9c9d341492 (diff) | |
| parent | e30b96217333cadb78dcc0a47545afd145c683a7 (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Conflicts:
MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.Api.dll
MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.ApiInteraction.Javascript.dll
MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.Server.Sqlite.dll
MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.Server.WorldWeatherOnline.dll
MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.WebDashboard.dll
Diffstat (limited to 'MediaBrowser.Api/Streaming/VideoHandler.cs')
| -rw-r--r-- | MediaBrowser.Api/Streaming/VideoHandler.cs | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/MediaBrowser.Api/Streaming/VideoHandler.cs b/MediaBrowser.Api/Streaming/VideoHandler.cs index 4a05d2547..da60297f2 100644 --- a/MediaBrowser.Api/Streaming/VideoHandler.cs +++ b/MediaBrowser.Api/Streaming/VideoHandler.cs @@ -1,21 +1,15 @@ -using System.IO; -using System.Threading; -using MediaBrowser.Common.IO; -using MediaBrowser.Common.Net.Handlers; +using MediaBrowser.Common.IO; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Resolvers; using System; -using System.ComponentModel.Composition; using System.Linq; using System.Net; -using MediaBrowser.Model.Entities; namespace MediaBrowser.Api.Streaming { /// <summary> /// Providers a progressive streaming video api /// </summary> - [Export(typeof(IHttpServerHandler))] class VideoHandler : BaseProgressiveStreamingHandler<Video> { /// <summary> |