diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-07-01 02:11:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-01 02:11:01 -0400 |
| commit | 7031a6ef8708d68d44915a52dc2e5e8c662e3b0f (patch) | |
| tree | 7a6870df33e7f63fe843c12d83b9e416424723be /MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs | |
| parent | 05b052789493a3da747443f11cd40db9867cfd0e (diff) | |
| parent | 54884d1168a90198c7dcb8fbe7f15fd1e83b057e (diff) | |
Merge pull request #1904 from MediaBrowser/beta
Beta
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs index 133cc8d70..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", - "libnvenc", + "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 |