diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-06-30 17:30:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-30 17:30:41 -0400 |
| commit | a83f0487e0e3edfc722888ec1550f54424333346 (patch) | |
| tree | f87a72d3f298256a214f11d9bca427db17e5decb /MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs | |
| parent | 5bdc96bb6a9b863980661e2d11c1ad00a02eb601 (diff) | |
| parent | 68df03b87292dca2a87a61fe9fac7ea3b441af74 (diff) | |
Merge pull request #1901 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs index 133cc8d70..e2348e8df 100644 --- a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs +++ b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs @@ -85,7 +85,7 @@ namespace MediaBrowser.MediaEncoding.Encoder "libopus", //"libvorbis", "srt", - "libnvenc", + "h264_nvenc", "h264_qsv" }; |
