Cherry-picks to release/31.0 #11934
Merged
Cherry-picks to release/31.0 #11934
+57
−56
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
(cherry picked from commit 83934ac)
This updates checks against current SDK redist versions: - 0.7.6 (Video Effects) - 1.6.1.2 (Audio Effects) Users will receive a warning if their redist versions are lower than these. Signed-off-by: pkv <[email protected]> (cherry picked from commit 417eddf)
We don't use CUDA RT functions anymore. So this commit removes their loading from the CUDA RT DLL. This also fixes a crash when loading different versions of CUDA RT when the SDK is updated [1]. [1] obsproject#11813 Signed-off-by: pkv <[email protected]> (cherry picked from commit d1249cd)
The regexp was not tolerating a + sign is the version string, causing configuration to fail on Ubuntu 24.04 when the installed version is 6.1.1-3ubuntu5+esm2. (cherry picked from commit 9b97d48)
(cherry picked from commit 05c2f56)
This was logging an intermediate value, rather than the final lookahead depth value after all calculations. Log the final value instead. (cherry picked from commit a8a349c)
(cherry picked from commit 50429bd)
082a0a2 - Don't emit a normal call to a function for closing panels 663dc38 - Disable modern game controller API on Windows 4023fad - Log fatal CEF crashes to file 52c1527 - Print browser source renderer crashes to OBS log af0651b - Log error if CefInitialize fails 8223215 - Revert "Enable Qt message loop on Linux" 16ff0fa - Update version to 2.24.5 Additionally, update buildspec.json and build-aux/modules/99-cef.json to use the new CEF builds. This is being done because the changes in obs-browser specifically are meant to work with a CEF build compiled with use_gtk=false. (cherry picked from commit 3d9d066)
If a frame has a width or height of zero, this value will make it into libobs/media-io/video-frame.c:video_frame_init and cause linesizes or heights to be zero, which will result in a bmalloc(0) call and OBS will crash. Instead of letting the call stack get that far, check the frame width and height here at the source, log an error, and return early if the frame width or height are zero. (cherry picked from commit 3437e2b)
(cherry picked from commit 4fd671e)
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.
Description
Cherry-picks:
Motivation and Context
Want to ship crash fixes and bug fixes.
How Has This Been Tested?
Tested on the PRs.
Types of changes
Checklist: