aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Api
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2016-03-05 13:54:27 -0500
committerLuke <luke.pulverenti@gmail.com>2016-03-05 13:54:27 -0500
commitc87e42b970a593178acde3ad583d1ed052c12f18 (patch)
treec5a206798ad7c36fb21ba6147398e9eb7bde7af9 /MediaBrowser.Api
parente0609f898c93bef41beb79e4343c3191944b0bf9 (diff)
parentc481daeb204d66f3ce543b2b862a9bc9c7159ca1 (diff)
Merge pull request #1533 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Api')
-rw-r--r--MediaBrowser.Api/Playback/Progressive/AudioService.cs8
1 files changed, 6 insertions, 2 deletions
diff --git a/MediaBrowser.Api/Playback/Progressive/AudioService.cs b/MediaBrowser.Api/Playback/Progressive/AudioService.cs
index ada4761c75..1d8f5003f1 100644
--- a/MediaBrowser.Api/Playback/Progressive/AudioService.cs
+++ b/MediaBrowser.Api/Playback/Progressive/AudioService.cs
@@ -73,9 +73,13 @@ namespace MediaBrowser.Api.Playback.Progressive
audioTranscodeParams.Add("-ac " + state.OutputAudioChannels.Value.ToString(UsCulture));
}
- if (state.OutputAudioSampleRate.HasValue)
+ // opus will fail on 44100
+ if (!string.Equals(state.OutputAudioCodec, "opus", global::System.StringComparison.OrdinalIgnoreCase))
{
- audioTranscodeParams.Add("-ar " + state.OutputAudioSampleRate.Value.ToString(UsCulture));
+ if (state.OutputAudioSampleRate.HasValue)
+ {
+ audioTranscodeParams.Add("-ar " + state.OutputAudioSampleRate.Value.ToString(UsCulture));
+ }
}
const string vn = " -vn";