diff options
| author | Patrick Barron <18354464+barronpm@users.noreply.github.com> | 2020-08-03 17:09:18 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-03 17:09:18 +0000 |
| commit | cd515bdbfd24b5ae43f4bf5280cf9cf975e87eb2 (patch) | |
| tree | bd890faf9b7e54d7c56facc77612c91e24c6bc20 /Jellyfin.Api/Controllers/AudioController.cs | |
| parent | 3a0bccb9418facb589e248d78de25b4e88d5de7d (diff) | |
| parent | d2dd847b6042845f9c0146acb953d454f13dbe9c (diff) | |
Merge pull request #3783 from Ullmie02/api-universal-audio
Move UniversalAudioService to Jellyfin.Api
Diffstat (limited to 'Jellyfin.Api/Controllers/AudioController.cs')
| -rw-r--r-- | Jellyfin.Api/Controllers/AudioController.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Jellyfin.Api/Controllers/AudioController.cs b/Jellyfin.Api/Controllers/AudioController.cs index d9afbd910..ebae1caa0 100644 --- a/Jellyfin.Api/Controllers/AudioController.cs +++ b/Jellyfin.Api/Controllers/AudioController.cs @@ -197,8 +197,8 @@ namespace Jellyfin.Api.Controllers [FromQuery] string? transcodingReasons, [FromQuery] int? audioStreamIndex, [FromQuery] int? videoStreamIndex, - [FromQuery] EncodingContext context, - [FromQuery] Dictionary<string, string> streamOptions) + [FromQuery] EncodingContext? context, + [FromQuery] Dictionary<string, string>? streamOptions) { bool isHeadRequest = Request.Method == System.Net.WebRequestMethods.Http.Head; @@ -253,7 +253,7 @@ namespace Jellyfin.Api.Controllers TranscodeReasons = transcodingReasons, AudioStreamIndex = audioStreamIndex, VideoStreamIndex = videoStreamIndex, - Context = context, + Context = context ?? EncodingContext.Static, StreamOptions = streamOptions }; |
