Skip to content

Commit aa0b4e5

Browse files
committed
Create and apply patches to change 'Windows.h' to 'windows.h'
1 parent 0b49dc8 commit aa0b4e5

File tree

3 files changed

+54
-2
lines changed

3 files changed

+54
-2
lines changed

cross_compile_ffmpeg.sh

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1349,15 +1349,19 @@ build_svt-hevc() {
13491349

13501350
build_svt-av1() {
13511351
do_git_checkout https://github.com/OpenVisualCloud/SVT-AV1.git
1352-
cd SVT-AV1_git/Build
1352+
cd SVT-AV1_git
1353+
git apply $patch_dir/SVT-AV1-Windows-lowercase.patch
1354+
cd Build
13531355
do_cmake_from_build_dir .. "-DCMAKE_BUILD_TYPE=Release"
13541356
do_make_and_make_install
13551357
cd ../..
13561358
}
13571359

13581360
build_svt-vp9() {
13591361
do_git_checkout https://github.com/OpenVisualCloud/SVT-VP9.git
1360-
cd SVT-VP9_git/Build
1362+
cd SVT-VP9_git
1363+
git apply $patch_dir/SVT-VP9-Windows-lowercase.patch
1364+
cd Build
13611365
do_cmake_from_build_dir ..
13621366
do_make_and_make_install
13631367
cd ../..
@@ -1955,12 +1959,21 @@ build_ffmpeg() {
19551959

19561960
cd $output_dir
19571961
apply_patch file://$patch_dir/frei0r_load-shared-libraries-dynamically.diff
1962+
#SVT-HEVC
19581963
wget https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/master/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch
19591964
git am 0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch
1965+
#Add SVT-AV1 to SVT-HEVC
19601966
#wget https://raw.githubusercontent.com/OpenVisualCloud/SVT-AV1/master/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch
19611967
#git apply 0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch
1968+
#Add SVT-VP9 to SVT-HEVC & SVT-AV1
19621969
#wget https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/master/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9-with-svt-hevc-av1.patch
19631970
#git apply 0001-Add-ability-for-ffmpeg-to-run-svt-vp9-with-svt-hevc-av1.patch
1971+
#SVT-AV1 only
1972+
#wget https://raw.githubusercontent.com/OpenVisualCloud/SVT-AV1/master/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch
1973+
#git apply 0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch
1974+
#SVT-VP9 only
1975+
#wget https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/master/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch
1976+
#git apply 0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch
19641977

19651978
if [ "$bits_target" = "32" ]; then
19661979
local arch=x86
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
diff --git a/Source/App/EncApp/EbAppMain.c b/Source/App/EncApp/EbAppMain.c
2+
index 40cc5a89..15bd81ef 100644
3+
--- a/Source/App/EncApp/EbAppMain.c
4+
+++ b/Source/App/EncApp/EbAppMain.c
5+
@@ -24,7 +24,7 @@
6+
#include "EbAppContext.h"
7+
#include "EbTime.h"
8+
#ifdef _WIN32
9+
-#include <Windows.h>
10+
+#include <windows.h>
11+
#else
12+
#include <pthread.h>
13+
#include <semaphore.h>
14+
diff --git a/Source/Lib/Common/Codec/EbThreads.h b/Source/Lib/Common/Codec/EbThreads.h
15+
index ffa8ca8b..b37803d8 100644
16+
--- a/Source/Lib/Common/Codec/EbThreads.h
17+
+++ b/Source/Lib/Common/Codec/EbThreads.h
18+
@@ -9,7 +9,7 @@
19+
#include "EbDefinitions.h"
20+
21+
#ifdef _WIN32
22+
-#include <Windows.h>
23+
+#include <windows.h>
24+
#endif
25+
26+
#ifdef __cplusplus
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/Source/Lib/Codec/EbThreads.h b/Source/Lib/Codec/EbThreads.h
2+
index 240eaa7..115a56d 100644
3+
--- a/Source/Lib/Codec/EbThreads.h
4+
+++ b/Source/Lib/Codec/EbThreads.h
5+
@@ -10,7 +10,7 @@
6+
#include "EbDefinitions.h"
7+
8+
#ifdef _WIN32
9+
-#include <Windows.h>
10+
+#include <windows.h>
11+
#endif
12+
13+
#ifdef __cplusplus

0 commit comments

Comments
 (0)