aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
diff options
context:
space:
mode:
authorgerrit507 <gerrit@gogel.me>2017-03-05 04:02:03 +0100
committergerrit507 <gerrit@gogel.me>2017-03-05 04:02:03 +0100
commitc1208a2f8d73d4c567562a044b77dfe5e6941bd6 (patch)
tree033fc6273c75ba9a23da3fb3089f82fa649879b8 /MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
parentc811d57bca4e837707acd8483029fb643d56ad1b (diff)
Fix naming of nvenc codecs. It should be nvenc_h264.
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs')
-rw-r--r--MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index ef356c7cd..090232ff0 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -50,7 +50,7 @@ namespace MediaBrowser.Controller.MediaEncoding
if (string.Equals(hwType, "nvenc", StringComparison.OrdinalIgnoreCase))
{
- return GetAvailableEncoder("h264_nvenc", defaultEncoder);
+ return GetAvailableEncoder("nvenc_h264", defaultEncoder);
}
if (string.Equals(hwType, "h264_omx", StringComparison.OrdinalIgnoreCase))
{
@@ -591,8 +591,8 @@ namespace MediaBrowser.Controller.MediaEncoding
}
- // h264 (h264_nvenc)
- else if (string.Equals(videoEncoder, "h264_nvenc", StringComparison.OrdinalIgnoreCase))
+ // h264 (nvenc_h264)
+ else if (string.Equals(videoEncoder, "nvenc_h264", StringComparison.OrdinalIgnoreCase))
{
param += "-preset default";
}
@@ -670,10 +670,10 @@ namespace MediaBrowser.Controller.MediaEncoding
{
var level = NormalizeTranscodingLevel(state.OutputVideoCodec, request.Level);
- // h264_qsv and h264_nvenc expect levels to be expressed as a decimal. libx264 supports decimal and non-decimal format
+ // h264_qsv and nvenc_h264 expect levels to be expressed as a decimal. libx264 supports decimal and non-decimal format
// also needed for libx264 due to https://trac.ffmpeg.org/ticket/3307
if (string.Equals(videoEncoder, "h264_qsv", StringComparison.OrdinalIgnoreCase) ||
- string.Equals(videoEncoder, "h264_nvenc", StringComparison.OrdinalIgnoreCase) ||
+ string.Equals(videoEncoder, "nvenc_h264", StringComparison.OrdinalIgnoreCase) ||
string.Equals(videoEncoder, "libx264", StringComparison.OrdinalIgnoreCase))
{
switch (level)