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

Guard avcodec_register_all() calls #7578

Merged
merged 1 commit into from Jan 25, 2022

Conversation

dvzrv
Copy link
Contributor

@dvzrv dvzrv commented Jan 24, 2022

{channels/tsmf/client/ffmpeg/tsmf,libfreerdp/codec/dsp}_ffmpeg.c:
Guard calls to avcodec_register_all() against use beyond
AV_VERSION_INT(58, 10, 100), where upstream ffmpeg made it obsolete.

This allows compiling with ffmpeg >= 5.0.

@freerdp-bot
Copy link

Can one of the admins verify this patch?

@floppym floppym linked an issue Jan 24, 2022 that may be closed by this pull request
@floppym
Copy link
Contributor

floppym commented Jan 24, 2022

Looks good to me!

@floppym
Copy link
Contributor

floppym commented Jan 24, 2022

Looks like you made a typo in the commit message: the function is named avcodec_register_all, not avcodec_register_call.

@dvzrv dvzrv changed the title Guard avcodec_register_call() calls Guard avcodec_register_all() calls Jan 24, 2022
@dvzrv
Copy link
Contributor Author

dvzrv commented Jan 24, 2022

Looks like you made a typo in the commit message: the function is named avcodec_register_all, not avcodec_register_call.

Thanks for noticing! I fixed it.

{channels/tsmf/client/ffmpeg/tsmf,libfreerdp/codec/dsp}_ffmpeg.c:
Guard calls to `avcodec_register_all()` against use beyond
`AV_VERSION_INT(58, 10, 100)`, where upstream ffmpeg made it obsolete.
@akallabeth akallabeth added this to the next milestone Jan 25, 2022
@akallabeth akallabeth merged commit d0488f8 into FreeRDP:master Jan 25, 2022
@akallabeth akallabeth mentioned this pull request Jan 25, 2022
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.

Build failure with ffmpeg-5.0
4 participants