diff options
| author | BaronGreenback <jimcartlidge@yahoo.co.uk> | 2020-11-16 19:47:36 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-16 19:47:36 +0000 |
| commit | 2bbfcc264d5b8469f491f7dc2e54d852c1c1111e (patch) | |
| tree | 00f15d3e4543a531bb5e6e0535fd43e683d1d6fd /Jellyfin.Api/Models/PlaybackDtos/TranscodingThrottler.cs | |
| parent | 4bfcc8b0d15a76d9d33e038cc4e5590fc1016750 (diff) | |
| parent | dc0e353b968e80b9532638f5a752f89572566d82 (diff) | |
Merge branch 'master' into emby-namig-nullable
Diffstat (limited to 'Jellyfin.Api/Models/PlaybackDtos/TranscodingThrottler.cs')
| -rw-r--r-- | Jellyfin.Api/Models/PlaybackDtos/TranscodingThrottler.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Jellyfin.Api/Models/PlaybackDtos/TranscodingThrottler.cs b/Jellyfin.Api/Models/PlaybackDtos/TranscodingThrottler.cs index b5e42ea29..872a46824 100644 --- a/Jellyfin.Api/Models/PlaybackDtos/TranscodingThrottler.cs +++ b/Jellyfin.Api/Models/PlaybackDtos/TranscodingThrottler.cs @@ -101,7 +101,7 @@ namespace Jellyfin.Api.Models.PlaybackDtos return _config.GetConfiguration<EncodingOptions>("encoding"); } - private async void TimerCallback(object state) + private async void TimerCallback(object? state) { if (_job.HasExited) { |