diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-03-22 00:16:37 -0400 |
|---|---|---|
| committer | Luke <luke.pulverenti@gmail.com> | 2016-03-22 00:16:37 -0400 |
| commit | 95f5859837c3fa1598b2677b3c114f28e80e1192 (patch) | |
| tree | 0a5bdfb4f82fd1bc00054312329de0b15e55d2cf /MediaBrowser.MediaEncoding | |
| parent | 86eec4bad3057816459d823cbddfee1249edf095 (diff) | |
| parent | 49c678037a329f35de0ff09999b79cd8a1d4694d (diff) | |
Merge pull request #1573 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.MediaEncoding')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs index 882b2e1c2..cbe24bda8 100644 --- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs +++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs @@ -604,7 +604,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles process.StandardError.BaseStream.CopyToAsync(logFileStream); - var ranToCompletion = process.WaitForExit(120000); + var ranToCompletion = process.WaitForExit(300000); if (!ranToCompletion) { |