diff options
| author | cvium <clausvium@gmail.com> | 2021-09-25 20:52:09 +0200 |
|---|---|---|
| committer | cvium <clausvium@gmail.com> | 2021-09-25 20:52:09 +0200 |
| commit | 30f3be1da0958dc9c129d09de13625b13f33a3a6 (patch) | |
| tree | 0b61f595e1fe1699c85d87358ccbb75cbde961c0 /Emby.Server.Implementations/Library/LiveStreamHelper.cs | |
| parent | 3e5cb8e04e11d05b4af54e88686e829429305870 (diff) | |
| parent | 17273a6075e2735642075c6060eb86fc910474a9 (diff) | |
Merge branch 'master' into keyframe_extraction_v1
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; |