Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix some ffmpeg 7.x related errors #28611

Merged
merged 1 commit into from
Nov 6, 2024
Merged

Conversation

xiota
Copy link
Contributor

@xiota xiota commented Nov 4, 2024

Fixes #28583
Related #28601

@CLAassistant
Copy link

CLAassistant commented Nov 4, 2024

CLA assistant check
All committers have signed the CLA.

@john-preston
Copy link
Member

It looks like it breaks on 6.* then, see the actions.

@xiota
Copy link
Contributor Author

xiota commented Nov 5, 2024

@john-preston Thanks for letting me know. Force pushed to rebase to 5.7.2 and revert to initial solution. Test built against ffmpeg 6.1.2 and 7.0.2.

@john-preston
Copy link
Member

hmm, but the define should somehow flow from ffmpeg version, ideally within this code, so that nothing should be specified outside, like in cmake or elsewhere.

@xiota
Copy link
Contributor Author

xiota commented Nov 6, 2024

The ffmpeg-related defines were added in #27907. They are already used in multiple files, including the one modified by this PR. I would rather not change them, add duplicate defines, or deviate from precedent.

#define DA_FFMPEG_NEW_CHANNEL_LAYOUT (LIBAVUTIL_VERSION_INT >= \
AV_VERSION_INT(57, 28, 100))
#define DA_FFMPEG_CONST_WRITE_CALLBACK (LIBAVFORMAT_VERSION_INT >= \
AV_VERSION_INT(61, 01, 100))
#define DA_FFMPEG_HAVE_DURATION (LIBAVUTIL_VERSION_INT >= \
AV_VERSION_INT(58, 02, 100))

@john-preston
Copy link
Member

oh, I see, yeah.. thanks

@john-preston john-preston merged commit da8a4ba into telegramdesktop:dev Nov 6, 2024
10 checks passed
@xiota xiota deleted the pr_28583 branch November 6, 2024 14:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

compiler errors, invalid conversion, no member named channels
4 participants