starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-26 10:44:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into authenticationdb-efcore

Browse Source
This commit is contained in:
Cody Robibero
2021-09-03 11:01:55 -06:00
parent 88157fcc77 95ca1d5487
commit ff9d14c811
220 changed files with 4473 additions and 2339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Jellyfin.Api/Helpers/StreamingHelpers.cs
View File

@@ -220,11 +220,7 @@ namespace Jellyfin.Api.Helpers
{
var resolution = ResolutionNormalizer.Normalize(
state.VideoStream?.BitRate,
state.VideoStream?.Width,
state.VideoStream?.Height,
state.OutputVideoBitrate.Value,
state.VideoStream?.Codec,
state.OutputVideoCodec,
state.VideoRequest.MaxWidth,
state.VideoRequest.MaxHeight);