Merge pull request #1912 from MediaBrowser/dev

fix interlace detection stderr
2016-07-02 17:47:05 -04:00 · 2016-07-02 17:47:05 -04:00 · 4413021213
commit 4413021213
parent bdcfa38104 dc49059f1b
1 changed files with 2 additions and 2 deletions
--- 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(),