aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2016-07-02 00:25:34 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2016-07-02 00:25:34 -0400
commit1295d1e6948bf67bf3495e6891dd72c034a6e012 (patch)
tree5d7f587f4f4269e0fe73ec4a8572a5c6ba150a06
parent22601f0a2ef0bdc7b27a3bfd72dd9150152eb7eb (diff)
fix probe stdout
-rw-r--r--MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index 7834a9feb..38516d720 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -482,8 +482,8 @@ namespace MediaBrowser.MediaEncoding.Encoder
UseShellExecute = false,
// Must consume both or ffmpeg may hang due to deadlocks. See comments below.
- //RedirectStandardOutput = true,
- RedirectStandardError = true,
+ RedirectStandardOutput = true,
+ //RedirectStandardError = true,
RedirectStandardInput = true,
FileName = FFProbePath,
Arguments = string.Format(args,
@@ -612,8 +612,8 @@ namespace MediaBrowser.MediaEncoding.Encoder
UseShellExecute = false,
// Must consume both or ffmpeg may hang due to deadlocks. See comments below.
- //RedirectStandardOutput = true,
- RedirectStandardError = true,
+ RedirectStandardOutput = true,
+ //RedirectStandardError = true,
RedirectStandardInput = true,
FileName = FFMpegPath,
Arguments = string.Format(args, probeSizeArgument, inputPath, videoStream.Index.ToString(CultureInfo.InvariantCulture)).Trim(),