diff options
| author | BaronGreenback <jimcartlidge@yahoo.co.uk> | 2020-11-12 09:18:49 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-12 09:18:49 +0000 |
| commit | 27bb17ef9d0ba72cb8c6a0a6f306c4226f132ac3 (patch) | |
| tree | eb609e64b5bd00bf9a66201e85cb6d41de99c596 /MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs | |
| parent | 63be65dd919f1e628452c64f0fae7a7f035bce96 (diff) | |
| parent | df2cb7f99504325ae35fdead0929225a0a2625f8 (diff) | |
Merge branch 'master' into Comment1
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs')
| -rw-r--r-- | MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs index 6cd0c70d2..6e9362cd1 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs @@ -287,6 +287,11 @@ namespace MediaBrowser.Controller.MediaEncoding return BaseRequest.AudioChannels; } + if (BaseRequest.TranscodingMaxAudioChannels.HasValue) + { + return BaseRequest.TranscodingMaxAudioChannels; + } + if (!string.IsNullOrEmpty(codec)) { var value = BaseRequest.GetOption(codec, "audiochannels"); |