diff options
| author | Tim Hobbs <jesus.tesh@gmail.com> | 2014-03-31 14:39:27 -0700 |
|---|---|---|
| committer | Tim Hobbs <jesus.tesh@gmail.com> | 2014-03-31 14:39:27 -0700 |
| commit | f4f76a1a5bcdef2ea3eb77101d70959bd70cb8e7 (patch) | |
| tree | 25da19e597d1e36fb768293385a3a212f37e8ef0 /MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs | |
| parent | 5693327a20c3f92f33da63cc3f0cb659d6cd8576 (diff) | |
| parent | 32ac5619fe3678b8482d8771941ad601e1a59afd (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs b/MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs index 79d512dc1..4a9023c7f 100644 --- a/MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs +++ b/MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs @@ -180,7 +180,9 @@ namespace MediaBrowser.MediaEncoding.Encoder { if (audioStream != null) { - if (audioStream.Channels > 2 && string.Equals(request.AudioCodec, "wma", StringComparison.OrdinalIgnoreCase)) + var codec = request.AudioCodec ?? string.Empty; + + if (audioStream.Channels > 2 && codec.IndexOf("wma", StringComparison.OrdinalIgnoreCase) != -1) { // wmav2 currently only supports two channel output return 2; |