diff options
| author | BaronGreenback <jimcartlidge@yahoo.co.uk> | 2020-11-04 20:17:41 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-04 20:17:41 +0000 |
| commit | ec245dce9074bd4fa64f1252f62d355e9185696c (patch) | |
| tree | 97f9fe31f10d42e167f6502bc1227a3006fec912 /MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs | |
| parent | f06e4826c764c1214478a741b0f93315a8bba76b (diff) | |
| parent | ad262fe8a65137b1678508435054be50b053f217 (diff) | |
Merge branch 'master' into NetworkPR2
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"); |