aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheTyrius <16269108+TheTyrius@users.noreply.github.com>2023-06-13 10:44:06 -0400
committerBond_009 <bond.009@outlook.com>2023-06-13 10:44:06 -0400
commit67bc81ec96dd7a3ef712907303aacb10b175cf56 (patch)
tree5f08825b3bbede12aeb3241cdd7f5f3c26a873a2
parented88c8bd2d3b7d53d26e16386957e7bc13b7edd7 (diff)
Backport pull request #9538 from jellyfin/release-10.8.z
Fix nvenc preset order Original-merge: 79bb7560dc7848608cfab538b3aaf56dea545d8f Merged-by: Cody Robibero <cody@robibe.ro> Backported-by: Bond_009 <bond.009@outlook.com>
-rw-r--r--CONTRIBUTORS.md1
-rw-r--r--MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs6
2 files changed, 4 insertions, 3 deletions
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 0b322685d..dfb61df0a 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -165,6 +165,7 @@
- [MinecraftPlaye](https://github.com/MinecraftPlaye)
- [RealGreenDragon](https://github.com/RealGreenDragon)
- [ipitio](https://github.com/ipitio)
+ - [TheTyrius](https://github.com/TheTyrius)
# Emby Contributors
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index 920925fc6..906a04a61 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -1549,11 +1549,11 @@ namespace MediaBrowser.Controller.MediaEncoding
param += " -preset p7";
break;
- case "slow":
+ case "slower":
param += " -preset p6";
break;
- case "slower":
+ case "slow":
param += " -preset p5";
break;
@@ -1586,8 +1586,8 @@ namespace MediaBrowser.Controller.MediaEncoding
switch (encodingOptions.EncoderPreset)
{
case "veryslow":
- case "slow":
case "slower":
+ case "slow":
param += " -quality quality";
break;