From f37a27f2f47ff965b90e4d4080ecbcf292c916b1 Mon Sep 17 00:00:00 2001 From: Andrey Volk Date: Wed, 28 Oct 2026 22:03:59 +0300 Subject: [PATCH] [Build-System] Windows: Upgrade FFmpeg to v8.1.3_1 and openh264 to 2.7.0, take FFmpeg from windows-deps (#3251) --- .../Setup.CA.DownloadOpenH264/CustomAction.cs | 2 +- w32/download_openh264.props | 2 +- w32/ffmpeg-version.props | 3 ++- w32/ffmpeg.props | 9 +++++---- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/w32/Setup/CustomActions/Setup.CA.DownloadOpenH264/CustomAction.cs b/w32/Setup/CustomActions/Setup.CA.DownloadOpenH264/CustomAction.cs index fcab4445c4..89ab930c1a 100644 --- a/w32/Setup/CustomActions/Setup.CA.DownloadOpenH264/CustomAction.cs +++ b/w32/Setup/CustomActions/Setup.CA.DownloadOpenH264/CustomAction.cs @@ -19,7 +19,7 @@ namespace Setup.CA.DownloadOpenH264 try { - WebRequest request = HttpWebRequest.Create("http://ciscobinary.openh264.org/openh264-1.8.0-win64.dll.bz2"); + WebRequest request = HttpWebRequest.Create("http://ciscobinary.openh264.org/openh264-2.7.0-win64.dll.bz2"); using (WebResponse response = request.GetResponse()) { diff --git a/w32/download_openh264.props b/w32/download_openh264.props index 1e5d7d7e19..c2d504ecf1 100644 --- a/w32/download_openh264.props +++ b/w32/download_openh264.props @@ -33,7 +33,7 @@ - 7.1.5 + 8.1.3 + 1 true diff --git a/w32/ffmpeg.props b/w32/ffmpeg.props index 39dec685b4..72a2365dde 100644 --- a/w32/ffmpeg.props +++ b/w32/ffmpeg.props @@ -17,15 +17,16 @@ $([System.Text.RegularExpressions.Regex]::Replace('$(Configuration)', '-.*$', '')) $([System.Text.RegularExpressions.Regex]::Replace('$(Configuration)', '^.*-', '')) - $(BaseDir)libs\ffmpeg-$(ffmpegVersion) + ffmpeg-$(ffmpegVersion)_$(ffmpegBuildNumber) + $(BaseDir)libs\$(ffmpegPkg) $(ffmpegDir)\binaries\$(ffmpegVariant)\$(Platform)\$(ffmpegConfigName) - https://github.com/freeswitch/ffmpeg-packaging/releases/download/ffmpeg-v$(ffmpegVersion) + https://github.com/freeswitch/windows-deps/releases/download/ffmpeg-v$(ffmpegVersion)_$(ffmpegBuildNumber)