alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-03-05 17:56:18 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge branch 'jellyfin:master' into AsyncKeyedLock-migration

Browse Source
This commit is contained in:
Mark Cilia Vincenti
2024-01-27 21:31:12 +01:00
committed by GitHub
parent 179965e774 054f42332d
commit 3fa86a4559
140 changed files with 1077 additions and 1539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
MediaBrowser.MediaEncoding/Transcoding/TranscodeManager.cs
View File

@@ -11,6 +11,7 @@ using System.Threading;
using System.Threading.Tasks;
using AsyncKeyedLock;
using Jellyfin.Data.Enums;
using Jellyfin.Extensions;
using MediaBrowser.Common;
using MediaBrowser.Common.Configuration;
using MediaBrowser.Common.Extensions;
@@ -401,7 +402,7 @@ public sealed class TranscodeManager : ITranscodeManager, IDisposable
if (state.VideoRequest is not null && !EncodingHelper.IsCopyCodec(state.OutputVideoCodec))
{
var user = userId.Equals(default) ? null : _userManager.GetUserById(userId);
var user = userId.IsEmpty() ? null : _userManager.GetUserById(userId);
if (user is not null && !user.HasPermission(PermissionKind.EnableVideoPlaybackTranscoding))
{
this.OnTranscodeFailedToStart(outputPath, transcodingJobType, state);