diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-08-07 16:17:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-07 16:17:30 -0400 |
| commit | ef487602e61371a3c2ed831bfb4d008421f4235b (patch) | |
| tree | b6d2eddf2eff3e829bdff80fc7c7a733e3b40e6a /MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs | |
| parent | dd013bf622759e3ca13a1236d3f016dc5051ce47 (diff) | |
| parent | 7daf34f048c162f0fc2e5b4d28935f0c93c3c281 (diff) | |
Merge pull request #2034 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs index 5d3db612f..a450097fd 100644 --- a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs +++ b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs @@ -87,6 +87,7 @@ namespace MediaBrowser.MediaEncoding.Encoder "h264_nvenc", "h264_qsv", "h264_omx", + "h264_vaapi", "ac3" }; @@ -156,4 +157,4 @@ namespace MediaBrowser.MediaEncoding.Encoder } } } -} +}
\ No newline at end of file |