mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-04-01 16:02:01 +01:00
Fix invalid merge conflict fix
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user