diff options
| author | crobibero <cody@robibe.ro> | 2020-11-11 08:08:06 -0700 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2020-11-11 08:08:06 -0700 |
| commit | 7ff212576e1fba5980163bcc1cd97c29aadc635f (patch) | |
| tree | 73b548bfedf984b83b2d8dc1f9b5406b1a9620de /Jellyfin.Api/Helpers/MediaInfoHelper.cs | |
| parent | 380359b495f234450b21eafd2e64fa84b1bf2dcb (diff) | |
| parent | 5669d1dad23153401d1e648faa9b62b1d0e81838 (diff) | |
Merge remote-tracking branch 'upstream/master' into bye-tvdb
Diffstat (limited to 'Jellyfin.Api/Helpers/MediaInfoHelper.cs')
| -rw-r--r-- | Jellyfin.Api/Helpers/MediaInfoHelper.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Jellyfin.Api/Helpers/MediaInfoHelper.cs b/Jellyfin.Api/Helpers/MediaInfoHelper.cs index e78f63b25..0d8315dee 100644 --- a/Jellyfin.Api/Helpers/MediaInfoHelper.cs +++ b/Jellyfin.Api/Helpers/MediaInfoHelper.cs @@ -166,7 +166,7 @@ namespace Jellyfin.Api.Helpers MediaSourceInfo mediaSource, DeviceProfile profile, AuthorizationInfo auth, - long? maxBitrate, + int? maxBitrate, long startTimeTicks, string mediaSourceId, int? audioStreamIndex, @@ -551,7 +551,7 @@ namespace Jellyfin.Api.Helpers } } - private long? GetMaxBitrate(long? clientMaxBitrate, User user, string ipAddress) + private int? GetMaxBitrate(int? clientMaxBitrate, User user, string ipAddress) { var maxBitrate = clientMaxBitrate; var remoteClientMaxBitrate = user.RemoteClientBitrateLimit ?? 0; |
