From 22601f0a2ef0bdc7b27a3bfd72dd9150152eb7eb Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 1 Jul 2016 22:16:05 -0400
Subject: reduce stdout redirection

---
 MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs')

diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index 68113c0d1..7834a9feb 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -482,7 +482,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 = FFProbePath,
@@ -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))
                     {
-- 
cgit v1.2.3


From 1295d1e6948bf67bf3495e6891dd72c034a6e012 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 2 Jul 2016 00:25:34 -0400
Subject: fix probe stdout

---
 MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs')

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(),
-- 
cgit v1.2.3


From dc49059f1bd731c14a34cd7340968f86c34ebc7c Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 2 Jul 2016 17:45:20 -0400
Subject: fix interlace detection stderr

---
 MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs')

diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index 38516d720..a78e23669 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -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(),
-- 
cgit v1.2.3