aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MediaBrowser.Api/Playback/BaseStreamingService.cs7
1 files changed, 2 insertions, 5 deletions
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index a05a84b98..b9f4473c6 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -893,12 +893,9 @@ namespace MediaBrowser.Api.Playback
resultChannels = Math.Min(request.MaxAudioChannels.Value, channelLimit);
}
- if (resultChannels.HasValue && !string.Equals(codec, "copy", StringComparison.OrdinalIgnoreCase))
+ if (request.TranscodingMaxAudioChannels.HasValue && !string.Equals(codec, "copy", StringComparison.OrdinalIgnoreCase))
{
- if (request.TranscodingMaxAudioChannels.HasValue)
- {
- resultChannels = Math.Min(request.TranscodingMaxAudioChannels.Value, resultChannels.Value);
- }
+ resultChannels = Math.Min(request.TranscodingMaxAudioChannels.Value, resultChannels ?? inputChannels ?? request.TranscodingMaxAudioChannels.Value);
}
return resultChannels ?? request.AudioChannels;