Skip to content

Commit 9f8de01

Browse files
committed
[mod_av] Add FFmpeg 5.1.3 support on Windows.
1 parent 6677838 commit 9f8de01

File tree

6 files changed

+946
-188
lines changed

6 files changed

+946
-188
lines changed

libs/win32/ffmpeg/ffmpeg.2017.vcxproj

+929-186
Large diffs are not rendered by default.

src/mod/applications/mod_av/avcodec.c

+3
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@
3535
#include <switch.h>
3636
#include "mod_av.h"
3737
#include <libavcodec/avcodec.h>
38+
#ifdef _MSC_VER
39+
#include <libavcodec/version.h> /* LIBAVCODEC_VERSION_INT */
40+
#endif
3841
#include <libavformat/avformat.h>
3942
#include <libavutil/opt.h>
4043
#include <libavutil/imgutils.h>

src/mod/applications/mod_av/avformat.c

+6
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,13 @@
3535
#include "mod_av.h"
3636
GCC_DIAG_OFF(deprecated-declarations)
3737
#include <libavcodec/avcodec.h>
38+
#ifdef _MSC_VER
39+
#include <libavcodec/version.h> /* LIBAVCODEC_VERSION_INT */
40+
#endif
3841
#include <libavformat/avformat.h>
42+
#ifdef _MSC_VER
43+
#include <libavformat/version.h> /* LIBAVFORMAT_VERSION_INT */
44+
#endif
3945
#include <libavutil/opt.h>
4046
#include <libavutil/imgutils.h>
4147
#include <libavutil/avstring.h>

src/mod/applications/mod_av/mod_av.c

+6
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,13 @@
3434
#include <switch.h>
3535
#include "mod_av.h"
3636
#include <libavcodec/avcodec.h>
37+
#ifdef _MSC_VER
38+
#include <libavcodec/version.h> /* LIBAVCODEC_VERSION_INT */
39+
#endif
3740
#include <libavformat/avformat.h>
41+
#ifdef _MSC_VER
42+
#include <libavformat/version.h> /* LIBAVFORMAT_VERSION_INT */
43+
#endif
3844

3945
SWITCH_MODULE_LOAD_FUNCTION(mod_avformat_load);
4046
SWITCH_MODULE_LOAD_FUNCTION(mod_avcodec_load);

w32/ffmpeg-version.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Import Project="basedir.props" Condition=" '$(BaseDirImported)' == ''"/>
55
</ImportGroup>
66
<PropertyGroup Label="UserMacros">
7-
<ffmpegVersion>4.1</ffmpegVersion>
7+
<ffmpegVersion>5.1.3</ffmpegVersion>
88
</PropertyGroup>
99
<PropertyGroup>
1010
<ffmpegVersionImported>true</ffmpegVersionImported>

w32/ffmpeg.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</ClCompile>
2222
<Link>
2323
<AdditionalLibraryDirectories>$(ffmpegDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
24-
<AdditionalDependencies>Bcrypt.lib;Secur32.lib;%(AdditionalDependencies)</AdditionalDependencies>
24+
<AdditionalDependencies>Bcrypt.lib;Secur32.lib;Mfuuid.lib;strmiids.lib;%(AdditionalDependencies)</AdditionalDependencies>
2525
<AdditionalDependencies Condition="'$(Configuration)'=='Debug-openh264' OR '$(Configuration)'=='Release-openh264'">openh264.lib;%(AdditionalDependencies)</AdditionalDependencies>
2626
</Link>
2727
</ItemDefinitionGroup>

0 commit comments

Comments
 (0)