diff options
| author | Bond-009 <bond.009@outlook.com> | 2021-09-25 22:24:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-25 22:24:57 +0200 |
| commit | 8858d8e59789ee3ad7b55077900d80437ef982b5 (patch) | |
| tree | b53f72bc270c09b33ff6d5eb4e57cd902ccad4a8 /Emby.Server.Implementations/Library/LiveStreamHelper.cs | |
| parent | 19b8bcaec43835c698a35975a748c2129c1413aa (diff) | |
| parent | 82cb6851786d4fb24952d77d869f9e9c005a960a (diff) | |
Merge branch 'master' into theorydata
Diffstat (limited to 'Emby.Server.Implementations/Library/LiveStreamHelper.cs')
| -rw-r--r-- | Emby.Server.Implementations/Library/LiveStreamHelper.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Emby.Server.Implementations/Library/LiveStreamHelper.cs b/Emby.Server.Implementations/Library/LiveStreamHelper.cs index 16b45161f..83acd8e9f 100644 --- a/Emby.Server.Implementations/Library/LiveStreamHelper.cs +++ b/Emby.Server.Implementations/Library/LiveStreamHelper.cs @@ -10,9 +10,9 @@ using System.Linq; using System.Text.Json; using System.Threading; using System.Threading.Tasks; +using Jellyfin.Extensions.Json; using MediaBrowser.Common.Configuration; using MediaBrowser.Common.Extensions; -using Jellyfin.Extensions.Json; using MediaBrowser.Controller.MediaEncoding; using MediaBrowser.Model.Dlna; using MediaBrowser.Model.Dto; |