diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-11-19 13:10:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-19 13:10:03 -0500 |
| commit | 2877da48835cf0127bf505ed6121d29309198f31 (patch) | |
| tree | 7d5f4ce7db93a914f2cc8c2247a760a163a1dd20 /MediaBrowser.MediaEncoding | |
| parent | 3fd52ff735a441a003a25c6f7abef91880d77b2c (diff) | |
| parent | 5209ce9b2f7d2c56bca2c65966a5e2e7cc982133 (diff) | |
Merge pull request #2295 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.MediaEncoding')
4 files changed, 7 insertions, 6 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs index 1b8b3feec..b37e783b8 100644 --- a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs +++ b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs @@ -81,8 +81,9 @@ namespace MediaBrowser.MediaEncoding.Encoder { output = GetProcessOutput(encoderAppPath, "-decoders"); } - catch + catch (Exception ) { + //_logger.ErrorException("Error detecting available decoders", ex); } var found = new List<string>(); diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs index ba1f23dfe..719083e73 100644 --- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs +++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs @@ -932,7 +932,7 @@ namespace MediaBrowser.MediaEncoding.Encoder var process = _processFactory.Create(new ProcessOptions { CreateNoWindow = true, - UseShellExecute = false, + UseShellExecute = true, FileName = FFMpegPath, Arguments = args, IsHidden = true, @@ -1035,7 +1035,7 @@ namespace MediaBrowser.MediaEncoding.Encoder var process = _processFactory.Create(new ProcessOptions { CreateNoWindow = true, - UseShellExecute = false, + UseShellExecute = true, FileName = FFMpegPath, Arguments = args, IsHidden = true, diff --git a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs index 6a1583094..09996e1d3 100644 --- a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs +++ b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs @@ -996,7 +996,7 @@ namespace MediaBrowser.MediaEncoding.Probing { _splitWhiteList = new List<string> { - "AC/DV" + "AC/DC" }; } diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs index 0bbc2d916..30955c22c 100644 --- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs +++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs @@ -451,7 +451,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles var process = _processFactory.Create(new ProcessOptions { CreateNoWindow = true, - UseShellExecute = false, + UseShellExecute = true, FileName = _mediaEncoder.EncoderPath, Arguments = string.Format("{0} -i \"{1}\" -c:s srt \"{2}\"", encodingParam, inputPath, outputPath), @@ -582,7 +582,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles var process = _processFactory.Create(new ProcessOptions { CreateNoWindow = true, - UseShellExecute = false, + UseShellExecute = true, FileName = _mediaEncoder.EncoderPath, Arguments = processArgs, |