@@ -98,15 +98,9 @@ set(FFmpeg_CONFIGURE_ARGS
9898if (toucan_FFmpeg_MINIMAL)
9999 list (APPEND FFmpeg_CONFIGURE_ARGS
100100 --disable-decoders
101- --enable-decoder=aac
102- --enable-decoder=ac3
101+ --enable-decoder=apv
103102 --enable-decoder=av1
104- --enable-decoder=dca
105- --enable-decoder=dnxhd
106- --enable-decoder=eac3
107103 --enable-decoder=flac
108- --enable-decoder=h264
109- --enable-decoder=hevc
110104 --enable-decoder=mjpeg
111105 --enable-decoder=mp3
112106 --enable-decoder=mpeg2video
@@ -146,22 +140,16 @@ if(toucan_FFmpeg_MINIMAL)
146140 --enable-decoder=pcm_u32le
147141 --enable-decoder=pcm_u8
148142 --enable-decoder=pcm_vidc
149- --enable-decoder=prores
150143 --enable-decoder=rawvideo
151144 --enable-decoder=v210
152145 --enable-decoder=v210x
153146 --enable-decoder=v308
154147 --enable-decoder=v408
155148 --enable-decoder=v410
156- --enable-decoder=vc1
157149 --enable-decoder=vp9
158150 --enable-decoder=yuv4
159151 --disable-encoders
160- --enable-encoder=aac
161- --enable-encoder=ac3
162- --enable-encoder=dnxhd
163- --enable-encoder=eac3
164- --enable-encoder=libsvtav1
152+ --enable-encoder=flac
165153 --enable-encoder=mjpeg
166154 --enable-encoder=mpeg2video
167155 --enable-encoder=mpeg4
@@ -196,30 +184,23 @@ if(toucan_FFmpeg_MINIMAL)
196184 --enable-encoder=pcm_u32le
197185 --enable-encoder=pcm_u8
198186 --enable-encoder=pcm_vidc
199- --enable-encoder=prores
200187 --enable-encoder=rawvideo
201188 --enable-encoder=v210
202189 --enable-encoder=v308
203190 --enable-encoder=v408
204191 --enable-encoder=v410
205192 --enable-encoder=yuv4
206193 --disable-demuxers
207- --enable-demuxer=aac
208- --enable-demuxer=ac3
209194 --enable-demuxer=aiff
195+ --enable-demuxer=apv
210196 --enable-demuxer=av1
211- --enable-demuxer=dnxhd
212- --enable-demuxer=dts
213- --enable-demuxer=dtshd
214- --enable-demuxer=eac3
215197 --enable-demuxer=flac
216- --enable-demuxer=h264
217- --enable-demuxer=hevc
218- --enable-demuxer=imf
219198 --enable-demuxer=m4v
199+ --enable-demuxer=matroska
220200 --enable-demuxer=mjpeg
221201 --enable-demuxer=mov
222202 --enable-demuxer=mp3
203+ --enable-demuxer=mp4
223204 --enable-demuxer=mxf
224205 --enable-demuxer=pcm_alaw
225206 --enable-demuxer=pcm_f32be
@@ -248,14 +229,9 @@ if(toucan_FFmpeg_MINIMAL)
248229 --enable-demuxer=wav
249230 --enable-demuxer=yuv4mpegpipe
250231 --disable-muxers
251- --enable-muxer=ac3
252232 --enable-muxer=aiff
253- --enable-muxer=dnxhd
254- --enable-muxer=dts
255- --enable-muxer=eac3
233+ --enable-muxer=apv
256234 --enable-muxer=flac
257- --enable-muxer=h264
258- --enable-muxer=hevc
259235 --enable-muxer=m4v
260236 --enable-muxer=mjpeg
261237 --enable-muxer=mov
@@ -287,14 +263,9 @@ if(toucan_FFmpeg_MINIMAL)
287263 --enable-muxer=wav
288264 --enable-muxer=yuv4mpegpipe
289265 --disable-parsers
290- --enable-parser=aac
291- --enable-parser=ac3
266+ --enable-parser=apv
292267 --enable-parser=av1
293- --enable-parser=dnxhd
294- --enable-parser=dolby_e
295268 --enable-parser=flac
296- --enable-parser=h264
297- --enable-parser=hevc
298269 --enable-parser=mjpeg
299270 --enable-parser=mpeg4video
300271 --enable-parser=mpegaudio
@@ -308,9 +279,9 @@ if(toucan_FFmpeg_MINIMAL)
308279 --enable-protocol=httpproxy
309280 --enable-protocol=https
310281 --enable-protocol=md5
311- --enable-protocol=pipe
282+ --enable-protocol=tcp
312283 --enable-protocol=tls
313- --disable-filters )
284+ --enable-protocol=udp )
314285endif ()
315286if (NOT WIN32 )
316287 list (APPEND FFmpeg_CONFIGURE_ARGS
@@ -379,42 +350,42 @@ else()
379350 set (FFmpeg_INSTALL make install )
380351 if (APPLE )
381352 list (APPEND FFmpeg_INSTALL
382- COMMAND install_name_tool -id @rpath/libavcodec.61.19 .100.dylib ${CMAKE_INSTALL_PREFIX} /lib/libavcodec.61 .dylib
383- COMMAND install_name_tool -id @rpath/libavdevice.61.3 .100.dylib ${CMAKE_INSTALL_PREFIX} /lib/libavdevice.61 .dylib
384- COMMAND install_name_tool -id @rpath/libavformat.61.7 .100.dylib ${CMAKE_INSTALL_PREFIX} /lib/libavformat.61 .dylib
385- COMMAND install_name_tool -id @rpath/libavutil.59.39 .100.dylib ${CMAKE_INSTALL_PREFIX} /lib/libavutil.59 .dylib
386- COMMAND install_name_tool -id @rpath/libswresample.5.3 .100.dylib ${CMAKE_INSTALL_PREFIX} /lib/libswresample.5 .dylib
387- COMMAND install_name_tool -id @rpath/libswscale.8.3 .100.dylib ${CMAKE_INSTALL_PREFIX} /lib/libswscale.8 .dylib
353+ COMMAND install_name_tool -id @rpath/libavcodec.62.11 .100.dylib ${CMAKE_INSTALL_PREFIX} /lib/libavcodec.62 .dylib
354+ COMMAND install_name_tool -id @rpath/libavdevice.62.1 .100.dylib ${CMAKE_INSTALL_PREFIX} /lib/libavdevice.62 .dylib
355+ COMMAND install_name_tool -id @rpath/libavformat.62.3 .100.dylib ${CMAKE_INSTALL_PREFIX} /lib/libavformat.62 .dylib
356+ COMMAND install_name_tool -id @rpath/libavutil.60.8 .100.dylib ${CMAKE_INSTALL_PREFIX} /lib/libavutil.60 .dylib
357+ COMMAND install_name_tool -id @rpath/libswresample.6.1 .100.dylib ${CMAKE_INSTALL_PREFIX} /lib/libswresample.6 .dylib
358+ COMMAND install_name_tool -id @rpath/libswscale.9.1 .100.dylib ${CMAKE_INSTALL_PREFIX} /lib/libswscale.9 .dylib
388359 COMMAND install_name_tool
389- -change ${CMAKE_INSTALL_PREFIX} /lib/libswresample.5 .dylib @rpath/libswresample.5 .dylib
390- -change ${CMAKE_INSTALL_PREFIX} /lib/libavutil.59 .dylib @rpath/libavutil.59 .dylib
391- ${CMAKE_INSTALL_PREFIX} /lib/libavcodec.61.19 .100.dylib
360+ -change ${CMAKE_INSTALL_PREFIX} /lib/libswresample.6 .dylib @rpath/libswresample.6 .dylib
361+ -change ${CMAKE_INSTALL_PREFIX} /lib/libavutil.60 .dylib @rpath/libavutil.60 .dylib
362+ ${CMAKE_INSTALL_PREFIX} /lib/libavcodec.62.11 .100.dylib
392363 COMMAND install_name_tool
393- -change ${CMAKE_INSTALL_PREFIX} /lib/libswscale.8 .dylib @rpath/libswscale.8 .dylib
394- -change ${CMAKE_INSTALL_PREFIX} /lib/libavformat.61 .dylib @rpath/libavformat.61 .dylib
395- -change ${CMAKE_INSTALL_PREFIX} /lib/libavcodec.61 .dylib @rpath/libavcodec.61 .dylib
396- -change ${CMAKE_INSTALL_PREFIX} /lib/libswresample.5 .dylib @rpath/libswresample.5 .dylib
397- -change ${CMAKE_INSTALL_PREFIX} /lib/libavutil.59 .dylib @rpath/libavutil.59 .dylib
398- ${CMAKE_INSTALL_PREFIX} /lib/libavdevice.61.3 .100.dylib
364+ -change ${CMAKE_INSTALL_PREFIX} /lib/libswscale.9 .dylib @rpath/libswscale.9 .dylib
365+ -change ${CMAKE_INSTALL_PREFIX} /lib/libavformat.62 .dylib @rpath/libavformat.62 .dylib
366+ -change ${CMAKE_INSTALL_PREFIX} /lib/libavcodec.62 .dylib @rpath/libavcodec.62 .dylib
367+ -change ${CMAKE_INSTALL_PREFIX} /lib/libswresample.6 .dylib @rpath/libswresample.6 .dylib
368+ -change ${CMAKE_INSTALL_PREFIX} /lib/libavutil.60 .dylib @rpath/libavutil.60 .dylib
369+ ${CMAKE_INSTALL_PREFIX} /lib/libavdevice.62.1 .100.dylib
399370 COMMAND install_name_tool
400- -change ${CMAKE_INSTALL_PREFIX} /lib/libavcodec.61 .dylib @rpath/libavcodec.61 .dylib
401- -change ${CMAKE_INSTALL_PREFIX} /lib/libswresample.5 .dylib @rpath/libswresample.5 .dylib
402- -change ${CMAKE_INSTALL_PREFIX} /lib/libavutil.59 .dylib @rpath/libavutil.59 .dylib
403- ${CMAKE_INSTALL_PREFIX} /lib/libavformat.61.7 .100.dylib
371+ -change ${CMAKE_INSTALL_PREFIX} /lib/libavcodec.62 .dylib @rpath/libavcodec.62 .dylib
372+ -change ${CMAKE_INSTALL_PREFIX} /lib/libswresample.6 .dylib @rpath/libswresample.6 .dylib
373+ -change ${CMAKE_INSTALL_PREFIX} /lib/libavutil.60 .dylib @rpath/libavutil.60 .dylib
374+ ${CMAKE_INSTALL_PREFIX} /lib/libavformat.62.3 .100.dylib
404375 COMMAND install_name_tool
405- -change ${CMAKE_INSTALL_PREFIX} /lib/libavutil.59 .dylib @rpath/libavutil.59 .dylib
406- ${CMAKE_INSTALL_PREFIX} /lib/libswresample.5.3 .100.dylib
376+ -change ${CMAKE_INSTALL_PREFIX} /lib/libavutil.60 .dylib @rpath/libavutil.60 .dylib
377+ ${CMAKE_INSTALL_PREFIX} /lib/libswresample.6.1 .100.dylib
407378 COMMAND install_name_tool
408- -change ${CMAKE_INSTALL_PREFIX} /lib/libavutil.59 .dylib @rpath/libavutil.59 .dylib
409- ${CMAKE_INSTALL_PREFIX} /lib/libswscale.8.3 .100.dylib)
379+ -change ${CMAKE_INSTALL_PREFIX} /lib/libavutil.60 .dylib @rpath/libavutil.60 .dylib
380+ ${CMAKE_INSTALL_PREFIX} /lib/libswscale.9.1 .100.dylib)
410381 endif ()
411382endif ()
412383
413384ExternalProject_Add(
414385 FFmpeg
415386 PREFIX ${CMAKE_CURRENT_BINARY_DIR} /FFmpeg
416387 DEPENDS ${FFmpeg_DEPS}
417- URL https://ffmpeg.org/releases/ffmpeg-7.1 .tar.bz2
388+ URL https://ffmpeg.org/releases/ffmpeg-8.0 .tar.bz2
418389 CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env PKG_CONFIG_PATH=${CMAKE_INSTALL_PREFIX} /lib/pkgconfig ${FFmpeg_CONFIGURE}
419390 BUILD_COMMAND ${FFmpeg_BUILD}
420391 INSTALL_COMMAND ${FFmpeg_INSTALL}
0 commit comments