diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-05-08 23:13:38 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-05-08 23:13:38 -0400 |
| commit | 99084edabeb1787f28496dffa55fbb260e34ae81 (patch) | |
| tree | 890304797a91f245f9a89a7e8e0fd51f850791c4 /MediaBrowser.Api/ApiEntryPoint.cs | |
| parent | fb25ac7c087be0808677f431023f0769a69c76d2 (diff) | |
update windows ffmpeg
Diffstat (limited to 'MediaBrowser.Api/ApiEntryPoint.cs')
| -rw-r--r-- | MediaBrowser.Api/ApiEntryPoint.cs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/MediaBrowser.Api/ApiEntryPoint.cs b/MediaBrowser.Api/ApiEntryPoint.cs index 66ca8c25d..a677bc600 100644 --- a/MediaBrowser.Api/ApiEntryPoint.cs +++ b/MediaBrowser.Api/ApiEntryPoint.cs @@ -488,13 +488,17 @@ namespace MediaBrowser.Api { try { - Logger.Info("Killing ffmpeg process for {0}", job.Path); + Logger.Info("Stopping ffmpeg process with q command for {0}", job.Path); //process.Kill(); process.StandardInput.WriteLine("q"); // Need to wait because killing is asynchronous - process.WaitForExit(5000); + if (!process.WaitForExit(5000)) + { + Logger.Info("Killing ffmpeg process for {0}", job.Path); + process.Kill(); + } } catch (Exception ex) { |