diff options
| author | Anthony Lavado <anthony@lavado.ca> | 2020-06-14 18:31:27 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-14 18:31:27 -0400 |
| commit | 15aea76523d1ad36ac4a1c8850bd099882c6325d (patch) | |
| tree | ba0d1f6fb725a803d0cea6e0f96d6cb7321bcc3f /MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | |
| parent | 403cd3205ffb970cfda88b6c49dc69127fada798 (diff) | |
| parent | 42b4f0aa2e299e7eda9c8e4a6a4ed88380a43148 (diff) | |
Merge pull request #3148 from barronpm/userdb-efcore
Migrate User DB to EF Core
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs')
| -rw-r--r-- | MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs index 2d2f73148..8ce106469 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs @@ -5,6 +5,7 @@ using System.IO; using System.Linq; using System.Text; using System.Threading; +using Jellyfin.Data.Enums; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Extensions; using MediaBrowser.Model.Configuration; @@ -2148,7 +2149,7 @@ namespace MediaBrowser.Controller.MediaEncoding var user = state.User; // If the user doesn't have access to transcoding, then force stream copy, regardless of whether it will be compatible or not - if (user != null && !user.Policy.EnableVideoPlaybackTranscoding) + if (user != null && !user.HasPermission(PermissionKind.EnableVideoPlaybackTranscoding)) { state.OutputVideoCodec = "copy"; } @@ -2164,7 +2165,7 @@ namespace MediaBrowser.Controller.MediaEncoding var user = state.User; // If the user doesn't have access to transcoding, then force stream copy, regardless of whether it will be compatible or not - if (user != null && !user.Policy.EnableAudioPlaybackTranscoding) + if (user != null && !user.HasPermission(PermissionKind.EnableAudioPlaybackTranscoding)) { state.OutputAudioCodec = "copy"; } |
