Commit f37a27f2f4 for freeswitch.com
commit f37a27f2f47ff965b90e4d4080ecbcf292c916b1
Author: Andrey Volk <andywolk@gmail.com>
Date: Wed Oct 28 22:03:59 2026 +0300
[Build-System] Windows: Upgrade FFmpeg to v8.1.3_1 and openh264 to 2.7.0, take FFmpeg from windows-deps (#3251)
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 @@
<Target Name="openh264DownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">
<DownloadPackageTask
- package="http://ciscobinary.openh264.org/openh264-1.8.0-win64.dll.bz2"
+ package="http://ciscobinary.openh264.org/openh264-2.7.0-win64.dll.bz2"
expectfileordirectory="$(BaseDir)$(Platform)\$(SolutionConfiguration)\openh264.dll"
outputfolder=""
outputfilename="openh264.dll.bz2"
diff --git a/w32/ffmpeg-version.props b/w32/ffmpeg-version.props
index 39b2956a50..8a0e990d65 100644
--- a/w32/ffmpeg-version.props
+++ b/w32/ffmpeg-version.props
@@ -4,7 +4,8 @@
<Import Project="basedir.props" Condition=" '$(BaseDirImported)' == ''"/>
</ImportGroup>
<PropertyGroup Label="UserMacros">
- <ffmpegVersion>7.1.5</ffmpegVersion>
+ <ffmpegVersion>8.1.3</ffmpegVersion>
+ <ffmpegBuildNumber>1</ffmpegBuildNumber>
</PropertyGroup>
<PropertyGroup>
<ffmpegVersionImported>true</ffmpegVersionImported>
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 @@
<ffmpegConfigName>$([System.Text.RegularExpressions.Regex]::Replace('$(Configuration)', '-.*$', ''))</ffmpegConfigName>
<ffmpegVariant>$([System.Text.RegularExpressions.Regex]::Replace('$(Configuration)', '^.*-', ''))</ffmpegVariant>
- <ffmpegDir>$(BaseDir)libs\ffmpeg-$(ffmpegVersion)</ffmpegDir>
+ <ffmpegPkg>ffmpeg-$(ffmpegVersion)_$(ffmpegBuildNumber)</ffmpegPkg>
+ <ffmpegDir>$(BaseDir)libs\$(ffmpegPkg)</ffmpegDir>
<ffmpegBinDir>$(ffmpegDir)\binaries\$(ffmpegVariant)\$(Platform)\$(ffmpegConfigName)</ffmpegBinDir>
- <ffmpegPkgBase>https://github.com/freeswitch/ffmpeg-packaging/releases/download/ffmpeg-v$(ffmpegVersion)</ffmpegPkgBase>
+ <ffmpegPkgBase>https://github.com/freeswitch/windows-deps/releases/download/ffmpeg-v$(ffmpegVersion)_$(ffmpegBuildNumber)</ffmpegPkgBase>
</PropertyGroup>
<!-- Download + extract the headers (config-independent). -->
<Target Name="ffmpegHeadersDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">
<DownloadPackageTask
- package="$(ffmpegPkgBase)/ffmpeg-$(ffmpegVersion)-headers.zip"
+ package="$(ffmpegPkgBase)/$(ffmpegPkg)-headers.zip"
expectfileordirectory="$(ffmpegDir)\include\libavcodec\avcodec.h"
outputfolder=""
outputfilename=""
@@ -36,7 +37,7 @@
<!-- Download + extract the per-variant, per-config binaries (DLLs + import libs). -->
<Target Name="ffmpegBinariesDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">
<DownloadPackageTask
- package="$(ffmpegPkgBase)/ffmpeg-$(ffmpegVersion)-$(ffmpegVariant)-binaries-$(Platform.ToLower())-$(ffmpegConfigName.ToLower()).zip"
+ package="$(ffmpegPkgBase)/$(ffmpegPkg)-$(ffmpegVariant)-binaries-$(Platform.ToLower())-$(ffmpegConfigName.ToLower()).zip"
expectfileordirectory="$(ffmpegBinDir)\avcodec.lib"
outputfolder=""
outputfilename=""