diff options
| author | crobibero <cody@robibe.ro> | 2021-05-27 06:07:57 -0600 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2021-05-27 06:07:57 -0600 |
| commit | 01e8ff8ddf84ac033a00917664482f67572e0f9b (patch) | |
| tree | 288ad75a0413995442eddf0e78d0c3bb72139456 /Emby.Server.Implementations/MediaEncoder/EncodingManager.cs | |
| parent | 78791a932f4a83834c1fb58e28a94cce6c8f349c (diff) | |
| parent | 75704effaed91456bf6e4d46f7d6c7145bcdec5f (diff) | |
Merge remote-tracking branch 'upstream/master' into healthy-base-url
Diffstat (limited to 'Emby.Server.Implementations/MediaEncoder/EncodingManager.cs')
| -rw-r--r-- | Emby.Server.Implementations/MediaEncoder/EncodingManager.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Emby.Server.Implementations/MediaEncoder/EncodingManager.cs b/Emby.Server.Implementations/MediaEncoder/EncodingManager.cs index a9dab9138..8aaa1f7bb 100644 --- a/Emby.Server.Implementations/MediaEncoder/EncodingManager.cs +++ b/Emby.Server.Implementations/MediaEncoder/EncodingManager.cs @@ -1,3 +1,5 @@ +#nullable disable + #pragma warning disable CS1591 using System; @@ -15,7 +17,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 |