diff options
| author | crobibero <cody@robibe.ro> | 2020-11-03 07:05:58 -0700 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2020-11-03 07:05:58 -0700 |
| commit | 5d88e610768c8b680096938a372585638ef18fe3 (patch) | |
| tree | 28cf4327a0cb19d6025f8fd426351becbb80b085 /MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs | |
| parent | 0c674b496f3f4503b6d45c763aadc9b1c5d2735d (diff) | |
| parent | 8fc16043c7c080afd31f67798b74ccdf62eb583c (diff) | |
Merge remote-tracking branch 'upstream/master' into livetv-ts-fix
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"); |