diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-09-09 14:27:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-09 14:27:09 -0400 |
| commit | dd463ab06c6eab82a0deeeab107663310d167108 (patch) | |
| tree | 292c8b51247b43284f8de7866d5241cba5687787 /MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | |
| parent | 8f604c657c379e331622a01c14571a7be2b68129 (diff) | |
| parent | 064ea2799464c7db5e6dbebd6228721840568690 (diff) | |
Merge pull request #2149 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs index 75d85cd32..a2707aace 100644 --- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs +++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs @@ -931,8 +931,9 @@ namespace MediaBrowser.MediaEncoding.Encoder var timeoutMs = ConfigurationManager.Configuration.ImageExtractionTimeoutMs; if (timeoutMs <= 0) { - timeoutMs = 10000; + timeoutMs = Environment.Is64BitOperatingSystem ? (Environment.ProcessorCount > 2 ? 14000 : 20000) : 40000; } + ranToCompletion = process.WaitForExit(timeoutMs); if (!ranToCompletion) |