diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-08-05 02:13:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-05 02:13:50 -0400 |
| commit | f326e73ab1cf3fba8fa94537dc715e14f575185e (patch) | |
| tree | 01d656f1827fd601d9b456a8b863028ca88d0d5c /MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs | |
| parent | 8cca5dfb03d126b87b007e4699b061433991d3ae (diff) | |
| parent | 386cf95220b4cd73dcab7024a43a1a0b155d6483 (diff) | |
Merge pull request #2026 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs index 50df08e66..5d3db612f 100644 --- a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs +++ b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs @@ -86,6 +86,7 @@ namespace MediaBrowser.MediaEncoding.Encoder "srt", "h264_nvenc", "h264_qsv", + "h264_omx", "ac3" }; |