From ff365dae3481390da7aea110246f2065d3987826 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Tue, 31 Mar 2026 19:46:47 -0400 Subject: [PATCH] Fix invalid merge conflict fix --- Jellyfin.Api/Helpers/StreamingHelpers.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jellyfin.Api/Helpers/StreamingHelpers.cs b/Jellyfin.Api/Helpers/StreamingHelpers.cs index 9fcbbaefd6..6d73b52ae2 100644 --- a/Jellyfin.Api/Helpers/StreamingHelpers.cs +++ b/Jellyfin.Api/Helpers/StreamingHelpers.cs @@ -485,7 +485,7 @@ public static class StreamingHelpers request.StartTimeTicks = long.Parse(val, CultureInfo.InvariantCulture); break; case 15: - if (videoRequest is not null && EncodingHelper.LevelValidationRegex().IsMatch(val)) + if (videoRequest is not null && EncodingHelper.LevelValidationRegexStr().IsMatch(val)) { videoRequest.Level = val; }