aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.MediaEncoding/Transcoding
diff options
context:
space:
mode:
authorMark Cilia Vincenti <markciliavincenti@gmail.com>2024-01-27 21:31:12 +0100
committerGitHub <noreply@github.com>2024-01-27 21:31:12 +0100
commit3fa86a45595c604a0211ba9ffbc4c7f78f9de881 (patch)
tree006a774c8d2464b53f3f6efc26c9549e4ab7d5ce /MediaBrowser.MediaEncoding/Transcoding
parent179965e7749794513be0b832e9d8fb31444e9779 (diff)
parent054f42332d8e0c45fb899eeaef982aa0fd549397 (diff)
Merge branch 'jellyfin:master' into AsyncKeyedLock-migration
Diffstat (limited to 'MediaBrowser.MediaEncoding/Transcoding')
-rw-r--r--MediaBrowser.MediaEncoding/Transcoding/TranscodeManager.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/MediaBrowser.MediaEncoding/Transcoding/TranscodeManager.cs b/MediaBrowser.MediaEncoding/Transcoding/TranscodeManager.cs
index bb61d7fa6..ab3eb3298 100644
--- a/MediaBrowser.MediaEncoding/Transcoding/TranscodeManager.cs
+++ b/MediaBrowser.MediaEncoding/Transcoding/TranscodeManager.cs
@@ -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);