diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-08-07 17:17:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-07 17:17:05 -0400 |
| commit | 2026a682ed363338ec6a27f099b0788f33be46f8 (patch) | |
| tree | 4113625119679c2264edf13d266150a7041cfc8e /MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs | |
| parent | daf2d41c9d1ac4c6f6baf10b2ed850aa4f5b9b30 (diff) | |
| parent | a86336ebc6913489f7e30b8fdf02947397b01bcb (diff) | |
Merge pull request #2037 from MediaBrowser/beta
Beta
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs index 50df08e66..a450097fd 100644 --- a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs +++ b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs @@ -86,6 +86,8 @@ namespace MediaBrowser.MediaEncoding.Encoder "srt", "h264_nvenc", "h264_qsv", + "h264_omx", + "h264_vaapi", "ac3" }; @@ -155,4 +157,4 @@ namespace MediaBrowser.MediaEncoding.Encoder } } } -} +}
\ No newline at end of file |