diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-06-30 23:06:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-30 23:06:40 -0400 |
| commit | d92bcd42c63b844248aae08bec5abe8b4bc83df7 (patch) | |
| tree | 491fb36e2527af2e9eb23017eb78daffc92497ea /MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs | |
| parent | 55de77ca28348fd0072b81bedbdc170b5a634e7d (diff) | |
| parent | 00634b62c53d145e3dc6ad707dfbe98cb21bfa5a (diff) | |
Merge pull request #1903 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs index e2348e8df..859452362 100644 --- a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs +++ b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs @@ -78,17 +78,19 @@ namespace MediaBrowser.MediaEncoding.Encoder "libx265", "mpeg4", "msmpeg4", - //"libvpx", - //"libvpx-vp9", + "libvpx", + "libvpx-vp9", "aac", "libmp3lame", "libopus", - //"libvorbis", + "libvorbis", "srt", "h264_nvenc", "h264_qsv" }; + output = output ?? string.Empty; + foreach (var codec in required) { var srch = " " + codec + " "; @@ -115,8 +117,7 @@ namespace MediaBrowser.MediaEncoding.Encoder Arguments = arguments, WindowStyle = ProcessWindowStyle.Hidden, ErrorDialog = false, - RedirectStandardOutput = true, - RedirectStandardError = true + RedirectStandardOutput = true } }; @@ -126,8 +127,6 @@ namespace MediaBrowser.MediaEncoding.Encoder try { - process.BeginErrorReadLine(); - return process.StandardOutput.ReadToEnd(); } catch |