Skip to content

Commit 4868103

Browse files
committed
CI FFmpeg SVT-VP9 patch
SVT-HEVC and SVT-VP9 patches now interfere (neighbor of SVT-VP9 is not libspeex but libsvthevc now).
1 parent 908165c commit 4868103

File tree

2 files changed

+46
-0
lines changed

2 files changed

+46
-0
lines changed

.github/scripts/Linux/download_build_ffmpeg.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ install_svt() {
2626
( git clone --depth 1 https://github.com/OpenVisualCloud/SVT-VP9.git && cd SVT-VP9/Build && cmake .. -DCMAKE_BUILD_TYPE=Release && cmake --build . --parallel && sudo cmake --install . || exit 1 )
2727
# if patch apply fails, try increasing $FFMPEG_GIT_DEPTH
2828
git am -3 SVT-HEVC/ffmpeg_plugin/master-*.patch
29+
patch SVT-VP9/ffmpeg_plugin/master-*.patch < "$GITHUB_WORKSPACE/\
30+
.github/scripts/Linux/tmp/\
31+
master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch.patch"
2932
git am -3 SVT-VP9/ffmpeg_plugin/master-*.patch
3033
}
3134

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
1c1
2+
< From 38eb54ccd1f624e2ab700c1b10a0e6980df9c0b2 Mon Sep 17 00:00:00 2001
3+
---
4+
> From c55eb91b2e5d86efa42387b48216236a3c9ff8eb Mon Sep 17 00:00:00 2001
5+
20c20
6+
< index 9f508a2527..a73e1f73c1 100755
7+
---
8+
> index e5a4ca42b2..dd5debf274 100755
9+
31c31
10+
< @@ -1955,6 +1956,7 @@ EXTERNAL_LIBRARY_LIST="
11+
---
12+
> @@ -1956,6 +1957,7 @@ EXTERNAL_LIBRARY_LIST="
13+
39c39
14+
< @@ -3587,6 +3589,7 @@ libvpx_vp8_decoder_deps="libvpx"
15+
---
16+
> @@ -3592,6 +3594,7 @@ libvpx_vp8_decoder_deps="libvpx"
17+
47,48c47
18+
< @@ -7008,6 +7011,7 @@ enabled libssh && require_pkg_config libssh "libssh >= 0.6.0" libssh/
19+
< enabled libspeex && require_pkg_config libspeex speex speex/speex.h speex_decoder_init
20+
---
21+
> @@ -7015,6 +7018,7 @@ enabled libspeex && require_pkg_config libspeex speex speex/speex.h spe
22+
50a50
23+
> enabled libsvthevc && require_pkg_config libsvthevc SvtHevcEnc EbApi.h EbInitHandle
24+
56c56
25+
< index dd5d0de898..5d2c74e95d 100644
26+
---
27+
> index 53a300a7ce..a00fa9f273 100644
28+
59c59
29+
< @@ -1160,6 +1160,7 @@ OBJS-$(CONFIG_LIBVO_AMRWBENC_ENCODER) += libvo-amrwbenc.o
30+
---
31+
> @@ -1162,6 +1162,7 @@ OBJS-$(CONFIG_LIBVO_AMRWBENC_ENCODER) += libvo-amrwbenc.o
32+
68c68
33+
< index c7e5f9910c..acb332fb08 100644
34+
---
35+
> index 63ad7ea6ff..5e023215dd 100644
36+
71c71
37+
< @@ -798,6 +798,7 @@ extern const FFCodec ff_libuavs3d_decoder;
38+
---
39+
> @@ -799,6 +799,7 @@ extern const FFCodec ff_libuavs3d_decoder;
40+
787c787
41+
< 2.46.1
42+
---
43+
> 2.47.0

0 commit comments

Comments
 (0)