Merge branch 'master' of https://github.com/MediaBrowser/Emby

1 files changed, 4 insertions, 4 deletions

diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index 68113c0d1..a78e23669 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -483,7 +483,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
                     // Must consume both or ffmpeg may hang due to deadlocks. See comments below.   
                     RedirectStandardOutput = true,
-                    RedirectStandardError = true,
+                    //RedirectStandardError = true,
                     RedirectStandardInput = true,
                     FileName = FFProbePath,
                     Arguments = string.Format(args,
@@ -517,7 +517,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
                 try
                 {
-                    process.BeginErrorReadLine();
+                    //process.BeginErrorReadLine();
 
                     var result = _jsonSerializer.DeserializeFromStream<InternalMediaInfoResult>(process.StandardOutput.BaseStream);
 
@@ -612,7 +612,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
                     UseShellExecute = false,
 
                     // Must consume both or ffmpeg may hang due to deadlocks. See comments below.   
-                    RedirectStandardOutput = true,
+                    //RedirectStandardOutput = true,
                     RedirectStandardError = true,
                     RedirectStandardInput = true,
                     FileName = FFMpegPath,
@@ -643,7 +643,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
                 try
                 {
-                    process.BeginOutputReadLine();
+                    //process.BeginOutputReadLine();
 
                     using (var reader = new StreamReader(process.StandardError.BaseStream))
                     {