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 compilation with libavfilter of ffmpeg >= 5.1 #1474

Merged
merged 2 commits into from
Oct 9, 2023

Conversation

JoelLinn
Copy link
Contributor

The previous PR #1410 apparently did not fix compilation if libavfilter is used. @erankor
However I am not using nginx-vod in an environment that requires filtering so it's hard to test for me, second opinion needed.

@pgassmann fyi

@erankor
Copy link
Contributor

erankor commented Sep 25, 2023

@JoelLinn, maybe I'm missing something, but av_channel_layout_from_mask is defined in libavutil, that is probably the reason I initially checked the libavutil version... Why are you checking the libavcodec version?

@JoelLinn
Copy link
Contributor Author

Mh, the changed structs are in libavcodec though. I guess it doesn’t really matter then; checking any of the two should be fine and I can probably revert that commit.
I thought one could separate the channel changes between ffmpeg libs but thats probably not possible

@JoelLinn JoelLinn force-pushed the fix-libavfilter-ffmpeg51 branch from 3c7dce4 to c9daba4 Compare October 6, 2023 19:56
@JoelLinn
Copy link
Contributor Author

JoelLinn commented Oct 6, 2023

@erankor I removed the commit

@erankor erankor merged commit b4d57ef into kaltura:master Oct 9, 2023
@erankor
Copy link
Contributor

erankor commented Oct 9, 2023

Merged, thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants