Author: al
Date: Mon Feb 17 23:27:51 2025
New Revision: 38675
Log:
configure: Fix regarding FFmpeg filter internal changes (FFFilter)
There was a change in FFmpeg to hide filter internals with a new
type FFFilter as opposed to the public API type AVFilter.
Support newest FFmpeg development version and releases like 7.1
by detecting how the build related files need to be generated.
Modified:
trunk/configure
Modified: trunk/configure
==============================================================================
--- trunk/configure Fri Jan 24 14:25:17 2025 (r38674)
+++ trunk/configure Mon Feb 17 23:27:51 2025 (r38675)
@@ -1554,6 +1554,11 @@ if test "$ffmpeg_a" != "no" && ! test -e
touch ffmpeg/mp_auto_pull
fi
+ffmpeg_filter_struct_name=AVFilter
+if grep -q FFFilter ffmpeg/configure; then
+ ffmpeg_filter_struct_name=FFFilter
+fi
+
list_subparts() {
test ! -e ffmpeg/libav${3} && return 1
pattern="s/^[^#]*${1}.*([^ ,]*, *\([^ ,)]*\).*/\1_${2}/p"
@@ -1577,7 +1582,7 @@ list_cbs_extern() {
list_subparts_filters() {
test ! -e ffmpeg/libav${1} && return 1
- pattern="s/^extern AVFilter ff_([avfsinkrc]{2,5})_([a-zA-Z0-9_]+);/\1_\2_filter/p"
+ pattern="s/^extern $ffmpeg_filter_struct_name ff_([avfsinkrc]{2,5})_([a-zA-Z0-9_]+);/\1_\2_filter/p"
sed -E -n "$pattern" ffmpeg/libav${1} | toupper
return 0
}
@@ -9843,7 +9848,7 @@ print_enabled_components libavdevice/out
print_enabled_components libavformat/demuxer_list.c FFInputFormat demuxer_list $libavdemuxers
print_enabled_components libavformat/muxer_list.c FFOutputFormat muxer_list $libavmuxers
print_enabled_components libavformat/protocol_list.c URLProtocol url_protocols $libavprotocols
-print_enabled_filters libavfilter/filter_list.c AVFilter filter_list $libavfilters
+print_enabled_filters libavfilter/filter_list.c "$ffmpeg_filter_struct_name" filter_list $libavfilters
fi
