diff options
| author | BaronGreenback <jimcartlidge@yahoo.co.uk> | 2020-11-16 16:27:37 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-16 16:27:37 +0000 |
| commit | d66f88672cdc21376b5ff5105e7d18b25d549879 (patch) | |
| tree | 1d6459225931fa03b9e299eb46fe765ffacf7839 /Jellyfin.Api/Models/PlaybackDtos/TranscodingThrottler.cs | |
| parent | e2769671a79dfd73ec2796bcc0cbe97584ee4023 (diff) | |
| parent | dc0e353b968e80b9532638f5a752f89572566d82 (diff) | |
Merge branch 'master' into NetworkPR2
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) { |