This repository has been archived by the owner on Feb 3, 2025. It is now read-only.
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.
🦟 Bug fix
Fixes compilation with ffmpeg 7.0
Summary
Homebrew recently added ffmpeg 7.0, against which gazebo-classic fails to compile (see osrf/homebrew-simulation#2636 and osrf/homebrew-simulation#2637). This uses a portion of the changes from gazebosim/gz-common#329 to fix the reference to the
channels
variable, and removes some code added in #3195 by @traversaro with the following comment:I removed the mentioned code, and it compiles and all parts of
UNIT_AudioDecoder_TEST
pass except forCheerFile
, which has long been failing.Checklist
codecheck
passed (See contributing)Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining
Signed-off-by
messages.