Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix nvenc preset order #9538

Merged
merged 2 commits into from
Mar 25, 2023

Conversation

TheTyrius
Copy link
Contributor

Changes
Changed the ordering of the "slow" and "slower" presets in the transcoding helper, so they are aligned with the order in the settings dropdown.

Did the same to a switch-case where there is no change in behavior right now (but might prevent a bug like this in the future).

Issues
First raised in #9537 thanks nyanmisaka for giving it a look so incredibly quickly (and also for all the other work you do on Jellyfin)

@nyanmisaka nyanmisaka changed the base branch from master to release-10.8.z March 25, 2023 13:55
@nyanmisaka
Copy link
Member

@TheTyrius Can you rebase to the release-10.8.z branch?

@TheTyrius
Copy link
Contributor Author

@TheTyrius Can you rebase to the release-10.8.z branch?

Will do. Should I generally target release branches (for future PRs)? I skimmed the contribution docs, and they told me to target master :)

@nyanmisaka
Copy link
Member

@TheTyrius Can you rebase to the release-10.8.z branch?

Will do. Should I generally target release branches (for future PRs)? I skimmed the contribution docs, and they told me to target master :)

Bug fixes -> Release branches (we will backport it to the master branch later)
New features -> Master branch

@TheTyrius
Copy link
Contributor Author

Looks fine now (and learnt about git rebase --onto in the process :D)

@crobibero crobibero removed the request for review from joshuaboniface March 25, 2023 14:54
@crobibero crobibero added the stable backport Backport into the next stable release label Mar 25, 2023
@crobibero crobibero merged commit 79bb756 into jellyfin:release-10.8.z Mar 25, 2023
nyanmisaka added a commit to nyanmisaka/jellyfin that referenced this pull request Apr 14, 2023
@jellyfin-bot jellyfin-bot removed the stable backport Backport into the next stable release label Jun 13, 2023
jellyfin-bot pushed a commit that referenced this pull request Jun 13, 2023
Fix nvenc preset order

Original-merge: 79bb756

Merged-by: Cody Robibero <cody@robibe.ro>

Backported-by: Bond_009 <bond.009@outlook.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants