Fix compatibility with FFmpeg 5.0 #325
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
github-actions
bot
added
馃彚 edifice
traversaro
force-pushed
the
fix306
branch
2 times, most recently
from
6ce1f8a
to
b4f8f34
Compare
scpeters
reviewed
Mar 19, 2022
scpeters
reviewed
Mar 19, 2022
av/src/AudioDecoder.cc
Outdated
| if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF) | ||
| { | ||
| break; | ||
| } |
traversaro
force-pushed
the
fix306
branch
2 times, most recently
from
dea1014
to
abde9e4
Compare
|
I think I confused the label bot logic as I originally created the PR against |
Signed-off-by: Silvio Traversaro <silvio@traversaro.it>
Codecov Report
@@ Coverage Diff @@
## ign-common3 #325 +/- ##
============================================
Coverage 76.58% 76.58%
============================================
Files 73 73
Lines 10403 10403
============================================
Hits 7967 7967
Misses 2436 2436
Continue to review full report at Codecov.
|
scpeters
added
馃彴 citadel
scpeters
added a commit
to osrf/homebrew-simulation
that referenced
this pull request
Mar 20, 2022
|
I've opened osrf/homebrew-simulation#1833 to restore ffmpeg 5.0 as a dependency of ignition-common3 and a separate test PR #326 that will build against its matching branch name |
scpeters
approved these changes
Mar 20, 2022
scpeters
added a commit
to osrf/homebrew-simulation
that referenced
this pull request
Mar 20, 2022
* Patch from gazebosim/gz-common#325 * update bottle. Co-authored-by: OSRF Build Bot <osrfbuild@osrfoundation.org>
scpeters
added a commit
to scpeters/homebrew-simulation
that referenced
this pull request
Mar 21, 2022
scpeters
added a commit
to scpeters/homebrew-simulation
that referenced
this pull request
Mar 22, 2022
scpeters
added a commit
to osrf/homebrew-simulation
that referenced
this pull request
Mar 22, 2022
Patch from gazebosim/gz-common#325 * Add ffmpeg dependency to ign-gazebo, ign-launch brew test-bot was complaining that ign-gazebo and ign-launch have "Undeclared dependencies with linkage" on ffmpeg@4. This adds an ffmpeg dependency to the edifice and fortress packages to accompany the ignition-common4 changes. Signed-off-by: Steve Peters <scpeters@openrobotics.org> * update bottle. Co-authored-by: OSRF Build Bot <osrfbuild@osrfoundation.org>
This was referenced Apr 10, 2022
8 tasks
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.
馃 Bug fix
Fixes #306
Summary
This PR fixes compilation against FFmpeg 5.0 . It has been tested by using the conda-forge build of ffmpeg 5.0 on Linux, in particular with this deps:
Checklist
codecheckpassed (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-bymessages.