Handle AVCodec fields deprecated in FFmpeg 7 #898
Merged
Conversation
This file contains hidden or 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
meta-cla
bot
added
the
CLA Signed
Dan-Flores
force-pushed
the
fix_ch_layouts_ffmpeg7
branch
from
479147c to
a17b466
Compare
Dan-Flores
changed the title
scotts
reviewed
Sep 16, 2025
| supportedSampleRates = avCodec.supported_samplerates; | ||
| #endif | ||
|
|
||
| if (supportedSampleRates == nullptr) { |
There was a problem hiding this comment.
We've been trying to keep FFmpeg version ifdef-ing out of the mainline logic, and keep it all in functions defined in FFMPEGCommon. I think we should defined there as something like:
const int* getSupportedSampleRates(const AVCodec& avCodec);
scotts
reviewed
Sep 16, 2025
| #else | ||
| supportedSampleFormats = avCodec.sample_fmts; | ||
| #endif | ||
|
|
There was a problem hiding this comment.
Ditto here about creating a function in FFMPEGCommon.
scotts
reviewed
Sep 18, 2025
| &avCodec, | ||
| AV_CODEC_CONFIG_SAMPLE_RATE, | ||
| 0, | ||
| (const void**)&supportedSampleRates, |
There was a problem hiding this comment.
Let's do a reinterpret_cast here; https://en.cppreference.com/w/cpp/language/reinterpret_cast.html. In general, we should never do a C-style cast, as it's not always obvious what kind of cast a C-style cast will actually become: https://en.cppreference.com/w/cpp/language/explicit_cast.html
scotts
reviewed
Sep 18, 2025
| &avCodec, | ||
| AV_CODEC_CONFIG_SAMPLE_FORMAT, | ||
| 0, | ||
| (const void**)&supportedSampleFormats, |
scotts
reviewed
Sep 18, 2025
| &avCodec, | ||
| AV_CODEC_CONFIG_CHANNEL_LAYOUT, | ||
| 0, | ||
| (const void**)&supported_layouts, |
scotts
approved these changes
Sep 18, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This PR resolves the AVCodec fields deprecated in FFmpeg 7, described in #873.
This field is replaced by avcodec_get_supported_config, which supports retrieval of multiple AVCodecConfig