Fix compilation with libavfilter of ffmpeg >= 5.1

kaltura / nginx-vod-module

NGINX-based MP4 Repackager

GNU Affero General Public License v3.0

1.99k stars 439 forks source link

Fix compilation with libavfilter of ffmpeg >= 5.1 #1474

Closed JoelLinn closed 11 months ago

JoelLinn commented 1 year ago

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 commented 1 year ago

@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 commented 1 year ago

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 commented 12 months ago

@erankor I removed the commit

erankor commented 11 months ago

Merged, thanks!