Commit 0dd7691 Giulio Carota
committed
1 parent 8230b6e commit 0dd7691 Copy full SHA for 0dd7691
File tree 6 files changed +10
-12
lines changed
6 files changed +10
-12
lines changed Original file line number Diff line number Diff line change @@ -10,11 +10,9 @@ endif()
10
10
11
11
12
12
if (APPLE )
13
- link_directories (/usr/local/Cellar/ffmpeg/4.4.1_5 /lib)
14
- include_directories (/usr/local/Cellar/ffmpeg/4.4.1_5 /include )
13
+ link_directories (/usr/local/Cellar/ffmpeg/5.0.1_2 /lib)
14
+ include_directories (/usr/local/Cellar/ffmpeg/5.0.1_2 /include )
15
15
endif ()
16
- link_directories (/usr/local/Cellar/ffmpeg/4.4.1_5/lib)
17
- include_directories (/usr/local/Cellar/ffmpeg/4.4.1_5/include )
18
16
19
17
if (UNIX AND NOT APPLE )
20
18
link_directories (/usr/local/ffmpeg/lib)
Original file line number Diff line number Diff line change @@ -22,9 +22,9 @@ endif()
22
22
23
23
if (APPLE )
24
24
set (CMAKE_PREFIX_PATH /Users/giuliocarota/Qt/QtDesignStudio/qt5_design_studio_reduced_version/lib/cmake/)
25
- set (PATH_TO_FFMPEG /usr/local/Cellar/ffmpeg@4/4.4.2_2/ )
25
+ set (PATH_TO_FFMPEG /usr/local/Cellar/ffmpeg/5.0.1_2 )
26
26
link_directories (${PATH_TO_FFMPEG} /lib)
27
- include_directories (${PATH_TO_FFMPEG} include )
27
+ include_directories (${PATH_TO_FFMPEG} / include )
28
28
find_package (Qt5 REQUIRED COMPONENTS Core Gui Widgets)
29
29
30
30
endif ()
Original file line number Diff line number Diff line change @@ -12,9 +12,9 @@ endif()
12
12
13
13
14
14
if (APPLE )
15
- set (PATH_TO_FFMPEG /usr/local/Cellar/ffmpeg@4/4.4.2_2/ )
15
+ set (PATH_TO_FFMPEG /usr/local/Cellar/ffmpeg/5.0.1_2 )
16
16
link_directories (${PATH_TO_FFMPEG} /lib)
17
- include_directories (${PATH_TO_FFMPEG} include )
17
+ include_directories (${PATH_TO_FFMPEG} / include )
18
18
endif ()
19
19
20
20
if (UNIX AND NOT APPLE )
Original file line number Diff line number Diff line change @@ -14,7 +14,7 @@ class SRMediaOutput {
14
14
private:
15
15
bool video_recorded;
16
16
bool audio_recorded;
17
- #if __linux__
17
+ #if (LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(59,0,0))
18
18
const AVOutputFormat* outputFormat;
19
19
#else
20
20
AVOutputFormat* outputFormat;
Original file line number Diff line number Diff line change @@ -20,7 +20,7 @@ AVFormatContext* SRAudioInput::open(){
20
20
// if one of them != nullptr then input already initialized
21
21
if (inFormatContext != nullptr || inCodecContext!= nullptr || streamIndex != -1 )
22
22
return inFormatContext;
23
- #if __linux__
23
+ #if (LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(59,0,0))
24
24
const AVInputFormat* inAInputFormat =nullptr ;
25
25
#else
26
26
AVInputFormat* inAInputFormat =nullptr ;
Original file line number Diff line number Diff line change @@ -84,8 +84,8 @@ AVFormatContext* SRVideoInput::open(){
84
84
// if one of them != nullptr then input already initialized
85
85
if (inFormatContext != nullptr || inCodecContext!= nullptr || streamIndex != -1 )
86
86
return inFormatContext;
87
- #if __linux__
88
- const AVInputFormat* inVInputFormat =nullptr ;
87
+ #if (LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(59,0,0))
88
+ const AVInputFormat* inVInputFormat =nullptr ;
89
89
#else
90
90
AVInputFormat* inVInputFormat =nullptr ;
91
91
#endif
You can’t perform that action at this time.
0 commit comments