diff options
| author | dkanada <dkanada@users.noreply.github.com> | 2020-04-11 20:10:16 +0900 |
|---|---|---|
| committer | dkanada <dkanada@users.noreply.github.com> | 2020-04-11 20:10:16 +0900 |
| commit | bd55bdb4e3ff4555a722321f92a4783f913204f3 (patch) | |
| tree | 1cdfcd2c8da8bfc79922c3bacf17d87ae448b701 /MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs | |
| parent | cbe1fe2c8f82af2233201203367ba8a532dbec8b (diff) | |
| parent | 299541f1b26136ef89741f28c7949cda4e5e485f (diff) | |
merge branch master into plugin
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs')
| -rw-r--r-- | MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs index 38ef33caf..1127a08de 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs @@ -9,8 +9,8 @@ using MediaBrowser.Model.Dto; using MediaBrowser.Model.Entities; using MediaBrowser.Model.IO; using MediaBrowser.Model.MediaInfo; -using MediaBrowser.Model.Session; using MediaBrowser.Model.Net; +using MediaBrowser.Model.Session; namespace MediaBrowser.Controller.MediaEncoding { |