Upstream merge #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
Fix PHP Notice in module.audio-video.riff.php
do not crash on empty seconds in DSS module
Compatibility fix for PHP 5.3
Update deprecated actions/checkout; lint against PHP 8.4
Upgrade PHPStan to v1.10.57
(reverting to merge current upstream version) This reverts commit 51366b4.
Merge from upstream current
Merged
jdforrester
approved these changes
May 13, 2024
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.
Undoes a conflicting fix merge from before and merges with upstream master branch. This leaves us with only one active customization vs upstream master (a small mpeg demux issue i want a better fix for before submitting upstream) plus all the current upstream fixes.