aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2016-05-14 14:26:22 -0400
committerLuke <luke.pulverenti@gmail.com>2016-05-14 14:26:22 -0400
commit1aeebef06f27fef11b8229ab9f389138ed81aea1 (patch)
tree3c538de3a3e04aa5d7906b0d20ef4b29fd83a3c2 /MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs
parentb852da1054663cf2106c2f2dfd250ff26816b281 (diff)
parentff980dc42c4ebc31151a3dd4bc4d8dac738fd801 (diff)
Merge pull request #1733 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs')
-rw-r--r--MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs
index 0ea48fab6..d551d5c8c 100644
--- a/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs
@@ -1008,7 +1008,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
// Boost volume to 200% when downsampling from 6ch to 2ch
if (channels.HasValue && channels.Value <= 2)
{
- if (state.AudioStream != null && state.AudioStream.Channels.HasValue && state.AudioStream.Channels.Value > 5)
+ if (state.AudioStream != null && state.AudioStream.Channels.HasValue && state.AudioStream.Channels.Value > 5 && !GetEncodingOptions().DownMixAudioBoost.Equals(1))
{
volParam = ",volume=" + GetEncodingOptions().DownMixAudioBoost.ToString(UsCulture);
}