Merge to have changes for obs 29 #2
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Interprocedural Optimization (INTERPROCEDURAL_OPTIMIZATION / IPO) is interpreted by CMake as Link-time code generation (LTCG). This causes build problems on Windows when Visual Studio versions mismatch, so let's remove it.
This reverts commit a050e86.
FFmpeg n6.0 has a bug with NVENC that causes OBS to crash. It was fixed in the commit immediatley after the n6.0 tag. There is currently no n6.0.1 tag, so update to the latest release/6.0 commit so that OBS does not crash when using FFmpeg NVENC.
Backports qt/qtbase@9f44553b3 which will only be in Qt 6.5.1 and later.
Fixes issue with static libraries not properly packaged for universal builds.
Merge obs deps for release 29.1.3
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.