diff options
| author | crobibero <cody@robibe.ro> | 2020-11-09 14:57:02 -0700 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2020-11-09 14:57:02 -0700 |
| commit | 6748ba287d8cd9054072ce1ffc51c7aa8690e108 (patch) | |
| tree | 5b859fa356ef2f6abd5fb281ff5655ccf5fd3ebf /MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs | |
| parent | f8e6edbfeb8c437c2ed0a9c9b44bed0fc105b2c2 (diff) | |
| parent | 296e534f670df9069e8cb50683a964ea2a5cdc37 (diff) | |
Merge remote-tracking branch 'upstream/master' into query-fields
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"); |