diff options
| author | Patrick Barron <barronpm@gmail.com> | 2021-05-18 18:09:46 -0400 |
|---|---|---|
| committer | Patrick Barron <barronpm@gmail.com> | 2021-05-18 18:09:46 -0400 |
| commit | a225f3479600b511b3a53cfba6d59f6bc3210821 (patch) | |
| tree | d310a84faaa98851407f990cce7b4f6caf725af3 /Emby.Server.Implementations/MediaEncoder/EncodingManager.cs | |
| parent | 12fa5c0c41c255f4d74d56eacaa38ed2da420d6f (diff) | |
| parent | 88a7875a2739bef91f1d7216c5ebd89b4c267911 (diff) | |
Merge branch 'master' into authenticationdb-efcore
# Conflicts:
# Jellyfin.Api/Helpers/RequestHelpers.cs
Diffstat (limited to 'Emby.Server.Implementations/MediaEncoder/EncodingManager.cs')
| -rw-r--r-- | Emby.Server.Implementations/MediaEncoder/EncodingManager.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Emby.Server.Implementations/MediaEncoder/EncodingManager.cs b/Emby.Server.Implementations/MediaEncoder/EncodingManager.cs index a9dab9138..031b5d2e7 100644 --- a/Emby.Server.Implementations/MediaEncoder/EncodingManager.cs +++ b/Emby.Server.Implementations/MediaEncoder/EncodingManager.cs @@ -15,7 +15,6 @@ using MediaBrowser.Controller.Providers; using MediaBrowser.Model.Dto; using MediaBrowser.Model.Entities; using MediaBrowser.Model.IO; -using MediaBrowser.Model.MediaInfo; using Microsoft.Extensions.Logging; namespace Emby.Server.Implementations.MediaEncoder |