diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-07-01 22:19:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-01 22:19:38 -0400 |
| commit | 4a3630a223a0b4aebd2e775d45ba0d453297d7ab (patch) | |
| tree | cd3b436fff048c651030949a3232afd0e61a9364 /MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs | |
| parent | ed690061ab250d567f342dd4dca741dcc8cf5df2 (diff) | |
| parent | 22601f0a2ef0bdc7b27a3bfd72dd9150152eb7eb (diff) | |
Merge pull request #1909 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs index 9eb796360..725f0bc6d 100644 --- a/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs +++ b/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs @@ -81,7 +81,7 @@ namespace MediaBrowser.MediaEncoding.Encoder UseShellExecute = false, // Must consume both stdout and stderr or deadlocks may occur - RedirectStandardOutput = true, + //RedirectStandardOutput = true, RedirectStandardError = true, RedirectStandardInput = true, @@ -133,7 +133,7 @@ namespace MediaBrowser.MediaEncoding.Encoder cancellationToken.Register(() => Cancel(process, encodingJob)); // MUST read both stdout and stderr asynchronously or a deadlock may occurr - process.BeginOutputReadLine(); + //process.BeginOutputReadLine(); // Important - don't await the log task or we won't be able to kill ffmpeg when the user stops playback new JobLogger(Logger).StartStreamingLog(encodingJob, process.StandardError.BaseStream, encodingJob.LogFileStream); |
