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/EncodingJobFactory.cs | |
| parent | 5bdc96bb6a9b863980661e2d11c1ad00a02eb601 (diff) | |
| parent | 68df03b87292dca2a87a61fe9fac7ea3b441af74 (diff) | |
Merge pull request #1901 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs b/MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs index 177009306..7c4b7fc2f 100644 --- a/MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs +++ b/MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs @@ -562,9 +562,9 @@ namespace MediaBrowser.MediaEncoding.Encoder return "h264_qsv"; } - if (string.Equals(options.HardwareAccelerationType, "libnvenc", StringComparison.OrdinalIgnoreCase)) + if (string.Equals(options.HardwareAccelerationType, "nvenc", StringComparison.OrdinalIgnoreCase)) { - return "libnvenc"; + return "h264_nvenc"; } if (string.Equals(options.HardwareAccelerationType, "h264_omx", StringComparison.OrdinalIgnoreCase)) { |