forked from Mirrors/freeswitch
[mod_av] Add FFmpeg 5.1.3 support on Windows.
This commit is contained in:
parent
667783831b
commit
9f8de014a1
File diff suppressed because it is too large
Load Diff
|
@ -35,6 +35,9 @@
|
||||||
#include <switch.h>
|
#include <switch.h>
|
||||||
#include "mod_av.h"
|
#include "mod_av.h"
|
||||||
#include <libavcodec/avcodec.h>
|
#include <libavcodec/avcodec.h>
|
||||||
|
#ifdef _MSC_VER
|
||||||
|
#include <libavcodec/version.h> /* LIBAVCODEC_VERSION_INT */
|
||||||
|
#endif
|
||||||
#include <libavformat/avformat.h>
|
#include <libavformat/avformat.h>
|
||||||
#include <libavutil/opt.h>
|
#include <libavutil/opt.h>
|
||||||
#include <libavutil/imgutils.h>
|
#include <libavutil/imgutils.h>
|
||||||
|
|
|
@ -35,7 +35,13 @@
|
||||||
#include "mod_av.h"
|
#include "mod_av.h"
|
||||||
GCC_DIAG_OFF(deprecated-declarations)
|
GCC_DIAG_OFF(deprecated-declarations)
|
||||||
#include <libavcodec/avcodec.h>
|
#include <libavcodec/avcodec.h>
|
||||||
|
#ifdef _MSC_VER
|
||||||
|
#include <libavcodec/version.h> /* LIBAVCODEC_VERSION_INT */
|
||||||
|
#endif
|
||||||
#include <libavformat/avformat.h>
|
#include <libavformat/avformat.h>
|
||||||
|
#ifdef _MSC_VER
|
||||||
|
#include <libavformat/version.h> /* LIBAVFORMAT_VERSION_INT */
|
||||||
|
#endif
|
||||||
#include <libavutil/opt.h>
|
#include <libavutil/opt.h>
|
||||||
#include <libavutil/imgutils.h>
|
#include <libavutil/imgutils.h>
|
||||||
#include <libavutil/avstring.h>
|
#include <libavutil/avstring.h>
|
||||||
|
|
|
@ -34,7 +34,13 @@
|
||||||
#include <switch.h>
|
#include <switch.h>
|
||||||
#include "mod_av.h"
|
#include "mod_av.h"
|
||||||
#include <libavcodec/avcodec.h>
|
#include <libavcodec/avcodec.h>
|
||||||
|
#ifdef _MSC_VER
|
||||||
|
#include <libavcodec/version.h> /* LIBAVCODEC_VERSION_INT */
|
||||||
|
#endif
|
||||||
#include <libavformat/avformat.h>
|
#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_avformat_load);
|
||||||
SWITCH_MODULE_LOAD_FUNCTION(mod_avcodec_load);
|
SWITCH_MODULE_LOAD_FUNCTION(mod_avcodec_load);
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
<Import Project="basedir.props" Condition=" '$(BaseDirImported)' == ''"/>
|
<Import Project="basedir.props" Condition=" '$(BaseDirImported)' == ''"/>
|
||||||
</ImportGroup>
|
</ImportGroup>
|
||||||
<PropertyGroup Label="UserMacros">
|
<PropertyGroup Label="UserMacros">
|
||||||
<ffmpegVersion>4.1</ffmpegVersion>
|
<ffmpegVersion>5.1.3</ffmpegVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<ffmpegVersionImported>true</ffmpegVersionImported>
|
<ffmpegVersionImported>true</ffmpegVersionImported>
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<AdditionalLibraryDirectories>$(ffmpegDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
<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>
|
<AdditionalDependencies Condition="'$(Configuration)'=='Debug-openh264' OR '$(Configuration)'=='Release-openh264'">openh264.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
|
|
Loading…
Reference in New Issue