Fix building against ffmpeg-4.x #28999
Merged
+13
−6
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
|
|
ilya-fedin
reviewed
Feb 24, 2025
| @@ -576,6 +576,7 @@ SwresamplePointer MakeSwresamplePointer( | |||
| if (!result) { | |||
| LogError(u"swr_alloc_set_opts"_q); | |||
| } | |||
| auto | |||
There was a problem hiding this comment.
Looks fragile... Wouldn't having AvErrorWrap error; before ifndef block be better?
| @@ -44,7 +44,13 @@ constexpr auto kFrameSize = 4096; | |||
| return {}; | |||
| } | |||
|
|
|||
|
|
|||
| #if DA_FFMPEG_NEW_CHANNEL_LAYOUT | |||
There was a problem hiding this comment.
This isn't correct. This macro is checking for libavutil version to be higher than 57.28.100. av_find_best_stream belongs to libavformat and has changed to the const pointer in 58.79.100 as far as I can see by ffmpeg commit history.
There was a problem hiding this comment.
i.e.
Suggested change
| #if DA_FFMPEG_NEW_CHANNEL_LAYOUT | |
| #if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(58, 79, 100) |
|
I have made the changes you suggested. |
|
Thanks but there's no need to have a separate commit... Can you squash it? |
|
Ok, it is now squashed into a single commit. |
|
Thanks! |
|
Thanks! |
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.
Tested against ffmpeg 4.4.5 and 6.1.2 though there may be versions in between where this breaks. Fixes #28660.