diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-06-30 17:14:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-30 17:14:36 -0400 |
| commit | bf0dd0d8aee03f905d2178a81ffb6724e94d2dc8 (patch) | |
| tree | dc99f4435bb167370b0ca078b882718e94d17cb1 /MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs | |
| parent | 3f5277e67e7fa197c35828ef86ce3bc206f406d6 (diff) | |
| parent | ffd3101ac63d082e8086311b98db5b2ef3971c12 (diff) | |
Merge pull request #1900 from egandt/dev
Fixes for nvenc support marked as experimental
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)) { |