diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-07-01 02:11:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-01 02:11:01 -0400 |
| commit | 7031a6ef8708d68d44915a52dc2e5e8c662e3b0f (patch) | |
| tree | 7a6870df33e7f63fe843c12d83b9e416424723be /MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs | |
| parent | 05b052789493a3da747443f11cd40db9867cfd0e (diff) | |
| parent | 54884d1168a90198c7dcb8fbe7f15fd1e83b057e (diff) | |
Merge pull request #1904 from MediaBrowser/beta
Beta
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)) { |