Preston_PLB
/
freeswitch
forked from Mirrors/freeswitch
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #2167 from signalwire/migrate_to_ffmpeg5win 

[mod_av] Add FFmpeg 5.1.3 support on Windows.
This commit is contained in:
Jakub Karolczyk 2023-07-18 18:44:18 +01:00 committed by GitHub
parent e8c80bf7fb 9f8de014a1
commit e764f292b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 952 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1127
libs/win32/ffmpeg/ffmpeg.2017.vcxproj
View File

File diff suppressed because it is too large Load Diff

3
src/mod/applications/mod_av/avcodec.c
View File

@ -35,6 +35,9 @@
#include <switch.h>
#include "mod_av.h"
#include <libavcodec/avcodec.h>
#ifdef _MSC_VER
#include <libavcodec/version.h> /* LIBAVCODEC_VERSION_INT */
#endif
#include <libavformat/avformat.h>
#include <libavutil/opt.h>
#include <libavutil/imgutils.h>

6
src/mod/applications/mod_av/avformat.c
View File

@ -35,7 +35,13 @@
#include "mod_av.h"
GCC_DIAG_OFF(deprecated-declarations)
#include <libavcodec/avcodec.h>
#ifdef _MSC_VER
#include <libavcodec/version.h> /* LIBAVCODEC_VERSION_INT */
#endif
#include <libavformat/avformat.h>
#ifdef _MSC_VER
#include <libavformat/version.h> /* LIBAVFORMAT_VERSION_INT */
#endif
#include <libavutil/opt.h>
#include <libavutil/imgutils.h>
#include <libavutil/avstring.h>

6
src/mod/applications/mod_av/mod_av.c
View File

@ -34,7 +34,13 @@
#include <switch.h>
#include "mod_av.h"
#include <libavcodec/avcodec.h>
#ifdef _MSC_VER
#include <libavcodec/version.h> /* LIBAVCODEC_VERSION_INT */
#endif
#include <libavformat/avformat.h>
#ifdef _MSC_VER
#include <libavformat/version.h> /* LIBAVFORMAT_VERSION_INT */
#endif
SWITCH_MODULE_LOAD_FUNCTION(mod_avformat_load);
SWITCH_MODULE_LOAD_FUNCTION(mod_avcodec_load);

2
w32/ffmpeg-version.props
View File

@ -4,7 +4,7 @@
<Import Project="basedir.props" Condition=" '$(BaseDirImported)' == ''"/>
</ImportGroup>
<PropertyGroup Label="UserMacros">
<ffmpegVersion>4.1</ffmpegVersion>
<ffmpegVersion>5.1.3</ffmpegVersion>
</PropertyGroup>
<PropertyGroup>
<ffmpegVersionImported>true</ffmpegVersionImported>

2
w32/ffmpeg.props
View File

@ -21,7 +21,7 @@
</ClCompile>
<Link>
<AdditionalLibraryDirectories>$(ffmpegDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>Bcrypt.lib;Secur32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>Bcrypt.lib;Secur32.lib;Mfuuid.lib;strmiids.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies Condition="'$(Configuration)'=='Debug-openh264' OR '$(Configuration)'=='Release-openh264'">openh264.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>