diff options
| author | Bond-009 <bond.009@outlook.com> | 2020-02-06 13:04:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-06 13:04:07 +0100 |
| commit | 0a43814596cc6df1a2bb9f8e9cd1967d9cf3abbd (patch) | |
| tree | 86326b10bac7bc27b28980b4c08f43b34f54904d /MediaBrowser.Controller/Entities/Video.cs | |
| parent | 3fe84c3213b8340f86aec0c5c488f7fc303b26cc (diff) | |
| parent | df739b5b2fc4b8f8cd9068326b01e7b8eb806c43 (diff) | |
Merge branch 'master' into sessionmanager
Diffstat (limited to 'MediaBrowser.Controller/Entities/Video.cs')
| -rw-r--r-- | MediaBrowser.Controller/Entities/Video.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/Entities/Video.cs b/MediaBrowser.Controller/Entities/Video.cs index af4d227bc..c3ea7f347 100644 --- a/MediaBrowser.Controller/Entities/Video.cs +++ b/MediaBrowser.Controller/Entities/Video.cs @@ -7,7 +7,6 @@ using System.Threading; using System.Threading.Tasks; using MediaBrowser.Controller.Library; using MediaBrowser.Controller.LiveTv; -using MediaBrowser.Controller.MediaEncoding; using MediaBrowser.Controller.Persistence; using MediaBrowser.Controller.Providers; using MediaBrowser.Model.Dto; |