unkin/jellyfin-ha-src
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix invalid merge conflict fix

Browse Source
This commit is contained in:
Joshua M. Boniface
2026-03-31 19:46:47 -04:00
parent 52aebfb7d3
commit ff365dae34
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jellyfin.Api/Helpers/StreamingHelpers.cs
+1 -1
View File
@@ -485,7 +485,7 @@ public static class StreamingHelpers
request.StartTimeTicks = long.Parse(val, CultureInfo.InvariantCulture); request.StartTimeTicks = long.Parse(val, CultureInfo.InvariantCulture);
break; break;
case 15: case 15:
if (videoRequest is not null && EncodingHelper.LevelValidationRegex().IsMatch(val)) if (videoRequest is not null && EncodingHelper.LevelValidationRegexStr().IsMatch(val))
{ {
videoRequest.Level = val; videoRequest.Level = val;
} }