aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Api/Playback/Progressive/VideoService.cs
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2015-06-15 00:28:29 -0400
committerLuke <luke.pulverenti@gmail.com>2015-06-15 00:28:29 -0400
commit7d9d57a36ecee8e8a74b92544166c8fe70a0f880 (patch)
treea7f8a6bdb038048449d45a1e8926843015886f97 /MediaBrowser.Api/Playback/Progressive/VideoService.cs
parent5aafbe3dd694813a4e68f21ee72e59d6c53e776a (diff)
parent55eb54cbc28e40254a50c5a25443e910798243dc (diff)
Merge pull request #1118 from MediaBrowser/dev
3.0.5641.4
Diffstat (limited to 'MediaBrowser.Api/Playback/Progressive/VideoService.cs')
-rw-r--r--MediaBrowser.Api/Playback/Progressive/VideoService.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/MediaBrowser.Api/Playback/Progressive/VideoService.cs b/MediaBrowser.Api/Playback/Progressive/VideoService.cs
index 283f9671f..ebd72b2ce 100644
--- a/MediaBrowser.Api/Playback/Progressive/VideoService.cs
+++ b/MediaBrowser.Api/Playback/Progressive/VideoService.cs
@@ -89,7 +89,7 @@ namespace MediaBrowser.Api.Playback.Progressive
protected override string GetCommandLineArguments(string outputPath, StreamState state, bool isEncoding)
{
// Get the output codec name
- var videoCodec = state.OutputVideoCodec;
+ var videoCodec = GetVideoEncoder(state.VideoRequest);
var format = string.Empty;
var keyFrame = string.Empty;
@@ -183,11 +183,11 @@ namespace MediaBrowser.Api.Playback.Progressive
}
// Get the output codec name
- var codec = state.OutputAudioCodec;
+ var codec = GetAudioEncoder(state.Request);
var args = "-codec:a:0 " + codec;
- if (codec.Equals("copy", StringComparison.OrdinalIgnoreCase))
+ if (string.Equals(codec, "copy", StringComparison.OrdinalIgnoreCase))
{
return args;
}