File tree 6 files changed +946
-188
lines changed
src/mod/applications/mod_av
6 files changed +946
-188
lines changed Load Diff Large diffs are not rendered by default.
Original file line number Diff line number Diff line change 35
35
#include <switch.h>
36
36
#include "mod_av.h"
37
37
#include <libavcodec/avcodec.h>
38
+ #ifdef _MSC_VER
39
+ #include <libavcodec/version.h> /* LIBAVCODEC_VERSION_INT */
40
+ #endif
38
41
#include <libavformat/avformat.h>
39
42
#include <libavutil/opt.h>
40
43
#include <libavutil/imgutils.h>
Original file line number Diff line number Diff line change 35
35
#include "mod_av.h"
36
36
GCC_DIAG_OFF (deprecated - declarations )
37
37
#include <libavcodec/avcodec.h>
38
+ #ifdef _MSC_VER
39
+ #include <libavcodec/version.h> /* LIBAVCODEC_VERSION_INT */
40
+ #endif
38
41
#include <libavformat/avformat.h>
42
+ #ifdef _MSC_VER
43
+ #include <libavformat/version.h> /* LIBAVFORMAT_VERSION_INT */
44
+ #endif
39
45
#include <libavutil/opt.h>
40
46
#include <libavutil/imgutils.h>
41
47
#include <libavutil/avstring.h>
Original file line number Diff line number Diff line change 34
34
#include <switch.h>
35
35
#include "mod_av.h"
36
36
#include <libavcodec/avcodec.h>
37
+ #ifdef _MSC_VER
38
+ #include <libavcodec/version.h> /* LIBAVCODEC_VERSION_INT */
39
+ #endif
37
40
#include <libavformat/avformat.h>
41
+ #ifdef _MSC_VER
42
+ #include <libavformat/version.h> /* LIBAVFORMAT_VERSION_INT */
43
+ #endif
38
44
39
45
SWITCH_MODULE_LOAD_FUNCTION (mod_avformat_load );
40
46
SWITCH_MODULE_LOAD_FUNCTION (mod_avcodec_load );
Original file line number Diff line number Diff line change 4
4
<Import Project =" basedir.props" Condition =" '$(BaseDirImported)' == ''" />
5
5
</ImportGroup >
6
6
<PropertyGroup Label =" UserMacros" >
7
- <ffmpegVersion >4.1 </ffmpegVersion >
7
+ <ffmpegVersion >5.1.3 </ffmpegVersion >
8
8
</PropertyGroup >
9
9
<PropertyGroup >
10
10
<ffmpegVersionImported >true</ffmpegVersionImported >
Original file line number Diff line number Diff line change 21
21
</ClCompile >
22
22
<Link >
23
23
<AdditionalLibraryDirectories >$(ffmpegDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories >
24
- <AdditionalDependencies >Bcrypt.lib;Secur32.lib;%(AdditionalDependencies)</AdditionalDependencies >
24
+ <AdditionalDependencies >Bcrypt.lib;Secur32.lib;Mfuuid.lib;strmiids.lib; %(AdditionalDependencies)</AdditionalDependencies >
25
25
<AdditionalDependencies Condition =" '$(Configuration)'=='Debug-openh264' OR '$(Configuration)'=='Release-openh264'" >openh264.lib;%(AdditionalDependencies)</AdditionalDependencies >
26
26
</Link >
27
27
</ItemDefinitionGroup >
You can’t perform that action at this time.
0 commit comments