diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-07-02 17:47:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-02 17:47:05 -0400 |
| commit | 4413021213aafd16941bccf7f591fc0db726a37d (patch) | |
| tree | 0eb2b8786a7bd9d73f7fe639da71f5d45b432c1c /MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | |
| parent | bdcfa3810475d7c64aa61d5f49e2b92b8dc82d96 (diff) | |
| parent | dc49059f1bd731c14a34cd7340968f86c34ebc7c (diff) | |
Merge pull request #1912 from MediaBrowser/dev
fix interlace detection stderr
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | 4 |
1 files changed, 2 insertions, 2 deletions
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(), |