diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-09-04 11:01:31 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-09-04 11:01:31 -0400 |
| commit | 9c7eef891b808c60181704046a48dd9cdbe96bae (patch) | |
| tree | 22701a69c5f0be2007f9ea1d16a244f36b8b1a50 /MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | |
| parent | daeedb98ea1ebc59c768ef16ccfdc19b752eea4d (diff) | |
add configurable encoding params
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs index ad84ffee8..75d85cd32 100644 --- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs +++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs @@ -928,7 +928,12 @@ namespace MediaBrowser.MediaEncoding.Encoder { StartProcess(processWrapper); - ranToCompletion = process.WaitForExit(10000); + var timeoutMs = ConfigurationManager.Configuration.ImageExtractionTimeoutMs; + if (timeoutMs <= 0) + { + timeoutMs = 10000; + } + ranToCompletion = process.WaitForExit(timeoutMs); if (!ranToCompletion) { |