Merge branch 'master' into Comment4

4 files changed, 8 insertions, 18 deletions

diff --git a/Jellyfin.Api/Helpers/MediaInfoHelper.cs b/Jellyfin.Api/Helpers/MediaInfoHelper.cs
index 1207fb513..e78f63b25 100644
--- a/Jellyfin.Api/Helpers/MediaInfoHelper.cs
+++ b/Jellyfin.Api/Helpers/MediaInfoHelper.cs
@@ -554,7 +554,7 @@ namespace Jellyfin.Api.Helpers
         private long? GetMaxBitrate(long? clientMaxBitrate, User user, string ipAddress)
         {
             var maxBitrate = clientMaxBitrate;
-            var remoteClientMaxBitrate = user?.RemoteClientBitrateLimit ?? 0;
+            var remoteClientMaxBitrate = user.RemoteClientBitrateLimit ?? 0;
 
             if (remoteClientMaxBitrate <= 0)
             {
diff --git a/Jellyfin.Api/Helpers/RequestHelpers.cs b/Jellyfin.Api/Helpers/RequestHelpers.cs
index 8dcf08af5..fb5c283f5 100644
--- a/Jellyfin.Api/Helpers/RequestHelpers.cs
+++ b/Jellyfin.Api/Helpers/RequestHelpers.cs
@@ -57,18 +57,6 @@ namespace Jellyfin.Api.Helpers
         }
 
         /// <summary>
-        /// Get parsed filters.
-        /// </summary>
-        /// <param name="filters">The filters.</param>
-        /// <returns>Item filters.</returns>
-        public static IEnumerable<ItemFilter> GetFilters(string? filters)
-        {
-            return string.IsNullOrEmpty(filters)
-                ? Array.Empty<ItemFilter>()
-                : filters.Split(',').Select(v => Enum.Parse<ItemFilter>(v, true));
-        }
-
-        /// <summary>
         /// Splits a string at a separating character into an array of substrings.
         /// </summary>
         /// <param name="value">The string to split.</param>
diff --git a/Jellyfin.Api/Helpers/StreamingHelpers.cs b/Jellyfin.Api/Helpers/StreamingHelpers.cs
index 89ab2da62..f4ec29bde 100644
--- a/Jellyfin.Api/Helpers/StreamingHelpers.cs
+++ b/Jellyfin.Api/Helpers/StreamingHelpers.cs
@@ -169,7 +169,7 @@ namespace Jellyfin.Api.Helpers
 
             string? containerInternal = Path.GetExtension(state.RequestedUrl);
 
-            if (string.IsNullOrEmpty(streamingRequest.Container))
+            if (!string.IsNullOrEmpty(streamingRequest.Container))
             {
                 containerInternal = streamingRequest.Container;
             }
diff --git a/Jellyfin.Api/Helpers/TranscodingJobHelper.cs b/Jellyfin.Api/Helpers/TranscodingJobHelper.cs
index 67e450372..0db1fabff 100644
--- a/Jellyfin.Api/Helpers/TranscodingJobHelper.cs
+++ b/Jellyfin.Api/Helpers/TranscodingJobHelper.cs
@@ -504,6 +504,11 @@ namespace Jellyfin.Api.Helpers
                 }
             }
 
+            if (string.IsNullOrEmpty(_mediaEncoder.EncoderPath))
+            {
+                throw new ArgumentException("FFMPEG path not set.");
+            }
+
             var process = new Process
             {
                 StartInfo = new ProcessStartInfo
@@ -735,10 +740,7 @@ namespace Jellyfin.Api.Helpers
         /// <param name="state">The state.</param>
         private void OnFfMpegProcessExited(Process process, TranscodingJobDto job, StreamState state)
         {
-            if (job != null)
-            {
-                job.HasExited = true;
-            }
+            job.HasExited = true;
 
             _logger.LogDebug("Disposing stream resources");
             state.Dispose();