diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-07-02 00:26:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-02 00:26:43 -0400 |
| commit | 1eea144e00e75efa9ba853870a7511c888cc94a8 (patch) | |
| tree | 89200adc0144aa77c34b2def2cb9818fb772dfdf /MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | |
| parent | fb7a893a5e05a179595f6ecc7c661be6674062c8 (diff) | |
| parent | 1295d1e6948bf67bf3495e6891dd72c034a6e012 (diff) | |
Merge pull request #1910 from MediaBrowser/dev
fix probe stdout
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | 8 |
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(), |