From d849086cd4612106dda2b9e86a640a0df6c835d4 Mon Sep 17 00:00:00 2001 From: Darby Johnston Date: Sun, 26 May 2024 16:57:13 -0700 Subject: [PATCH] Update FFmpeg version --- cmake/Modules/Package.cmake | 12 ++++++------ etc/SuperBuild/cmake/Modules/BuildFFmpeg.cmake | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmake/Modules/Package.cmake b/cmake/Modules/Package.cmake index e51ec1197..510c749ca 100644 --- a/cmake/Modules/Package.cmake +++ b/cmake/Modules/Package.cmake @@ -8,12 +8,12 @@ if(WIN32) if(TLRENDER_FFMPEG) set(FFMPEG_DLLS - ${CMAKE_INSTALL_PREFIX}/bin/avcodec-60.dll - ${CMAKE_INSTALL_PREFIX}/bin/avdevice-60.dll - ${CMAKE_INSTALL_PREFIX}/bin/avformat-60.dll - ${CMAKE_INSTALL_PREFIX}/bin/avutil-58.dll - ${CMAKE_INSTALL_PREFIX}/bin/swresample-4.dll - ${CMAKE_INSTALL_PREFIX}/bin/swscale-7.dll) + ${CMAKE_INSTALL_PREFIX}/bin/avcodec-61.dll + ${CMAKE_INSTALL_PREFIX}/bin/avdevice-61.dll + ${CMAKE_INSTALL_PREFIX}/bin/avformat-61.dll + ${CMAKE_INSTALL_PREFIX}/bin/avutil-59.dll + ${CMAKE_INSTALL_PREFIX}/bin/swresample-5.dll + ${CMAKE_INSTALL_PREFIX}/bin/swscale-8.dll) list(APPEND INSTALL_DLLS ${FFMPEG_DLLS}) endif() diff --git a/etc/SuperBuild/cmake/Modules/BuildFFmpeg.cmake b/etc/SuperBuild/cmake/Modules/BuildFFmpeg.cmake index b5e684f5f..b91b9d232 100644 --- a/etc/SuperBuild/cmake/Modules/BuildFFmpeg.cmake +++ b/etc/SuperBuild/cmake/Modules/BuildFFmpeg.cmake @@ -396,7 +396,7 @@ ExternalProject_Add( FFmpeg PREFIX ${CMAKE_CURRENT_BINARY_DIR}/FFmpeg DEPENDS ${FFmpeg_DEPS} - URL https://ffmpeg.org/releases/ffmpeg-6.0.tar.bz2 + URL https://ffmpeg.org/releases/ffmpeg-7.0.1.tar.bz2 CONFIGURE_COMMAND ${FFmpeg_CONFIGURE} BUILD_COMMAND ${FFmpeg_BUILD} INSTALL_COMMAND ${FFmpeg_INSTALL}