diff options
| author | Luke <luke.pulverenti@gmail.com> | 2015-06-15 00:28:29 -0400 |
|---|---|---|
| committer | Luke <luke.pulverenti@gmail.com> | 2015-06-15 00:28:29 -0400 |
| commit | 7d9d57a36ecee8e8a74b92544166c8fe70a0f880 (patch) | |
| tree | a7f8a6bdb038048449d45a1e8926843015886f97 /MediaBrowser.Api/Playback/Hls/VideoHlsService.cs | |
| parent | 5aafbe3dd694813a4e68f21ee72e59d6c53e776a (diff) | |
| parent | 55eb54cbc28e40254a50c5a25443e910798243dc (diff) | |
Merge pull request #1118 from MediaBrowser/dev
3.0.5641.4
Diffstat (limited to 'MediaBrowser.Api/Playback/Hls/VideoHlsService.cs')
| -rw-r--r-- | MediaBrowser.Api/Playback/Hls/VideoHlsService.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs b/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs index f21be190f..d8e3423fc 100644 --- a/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs +++ b/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs @@ -48,9 +48,9 @@ namespace MediaBrowser.Api.Playback.Hls /// <returns>System.String.</returns> protected override string GetAudioArguments(StreamState state) { - var codec = state.OutputAudioCodec; + var codec = GetAudioEncoder(state.Request); - if (codec.Equals("copy", StringComparison.OrdinalIgnoreCase)) + if (string.Equals(codec, "copy", StringComparison.OrdinalIgnoreCase)) { return "-codec:a:0 copy"; } @@ -83,7 +83,7 @@ namespace MediaBrowser.Api.Playback.Hls /// <returns>System.String.</returns> protected override string GetVideoArguments(StreamState state) { - var codec = state.OutputVideoCodec; + var codec = GetVideoEncoder(state.VideoRequest); var args = "-codec:v:0 " + codec; |
