aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs
diff options
context:
space:
mode:
authorhatharry <hatharry@hotmail.com>2016-08-28 12:51:32 +0000
committerGitHub <noreply@github.com>2016-08-28 12:51:32 +0000
commitc974641a352685b2e6595dd7b291843c8e6364ac (patch)
tree2e6ca83c4d08c5b676e12edae947e635d290bc3f /MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs
parentf21f9923de6291aaf985f32dbbbaddbb26d07fb1 (diff)
parent81765ff29f624fd34e1abe3c7bb8149bbb001aef (diff)
Merge pull request #22 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs')
-rw-r--r--MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs
index 82a966821..457fbe2c2 100644
--- a/MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs
@@ -21,7 +21,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
protected override async Task<string> GetCommandLineArguments(EncodingJob state)
{
// Get the output codec name
- var videoCodec = EncodingJobFactory.GetVideoEncoder(state, GetEncodingOptions());
+ var videoCodec = EncodingJobFactory.GetVideoEncoder(MediaEncoder, state, GetEncodingOptions());
var format = string.Empty;
var keyFrame = string.Empty;
@@ -84,7 +84,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
return args;
}
- var keyFrameArg = string.Format(" -force_key_frames expr:gte(t,n_forced*{0})",
+ var keyFrameArg = string.Format(" -force_key_frames \"expr:gte(t,n_forced*{0})\"",
5.ToString(UsCulture));
args += keyFrameArg;
@@ -192,4 +192,4 @@ namespace MediaBrowser.MediaEncoding.Encoder
get { return true; }
}
}
-}
+} \ No newline at end of file