diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-03-08 02:24:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-08 02:24:30 -0500 |
| commit | 23010f2980381a4b56e05620d4604cafc0e00043 (patch) | |
| tree | 418b4ad6964c84d17ff9c33fa88b0e1a8bcacd34 /MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs | |
| parent | 0ac0a09c806112ce82dcd23f43c7df9ff8b5531d (diff) | |
| parent | 314b84ae9ef5a692144b0a3a178ddcbd393c9fb9 (diff) | |
Merge pull request #2516 from MediaBrowser/beta
Beta
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 b37e783b8..9c1189f6c 100644 --- a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs +++ b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs @@ -90,6 +90,7 @@ namespace MediaBrowser.MediaEncoding.Encoder var required = new[] { "h264_qsv", + "hevc_qsv", "mpeg2_qsv", "vc1_qsv" }; @@ -134,9 +135,13 @@ namespace MediaBrowser.MediaEncoding.Encoder "libvorbis", "srt", "h264_nvenc", + "hevc_nvenc", "h264_qsv", + "hevc_qsv", "h264_omx", + "hevc_omx", "h264_vaapi", + "hevc_vaapi", "ac3" }; @@ -205,4 +210,4 @@ namespace MediaBrowser.MediaEncoding.Encoder } } } -}
\ No newline at end of file +} |
