diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-10-28 15:57:49 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-28 15:57:49 -0400 |
| commit | 6367da37a6375a13536704c42642a2dac7be9bc8 (patch) | |
| tree | d969c40cff45ae90e76392526a43f16b661eab09 /MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs | |
| parent | 791d0f75b95ad9e2800f1b0f43fb33d052b18479 (diff) | |
| parent | 9c6da95d6a5dce333fb66a58d73f7655f3a4d6ce (diff) | |
Merge pull request #2257 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs index 7acff8fc8..a78d6cfd6 100644 --- a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs +++ b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs @@ -26,7 +26,7 @@ namespace MediaBrowser.MediaEncoding.Encoder return new Tuple<List<string>, List<string>>(decoders, encoders); } - public bool ValidateVersion(string encoderAppPath) + public bool ValidateVersion(string encoderAppPath, bool logOutput) { string output = string.Empty; try @@ -37,6 +37,11 @@ namespace MediaBrowser.MediaEncoding.Encoder { } + if (logOutput) + { + _logger.Info("ffmpeg info: {0}", output ?? string.Empty); + } + if (string.IsNullOrWhiteSpace(output)) { return false; |
