scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-20 10:40:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

CI: removed SVT-VP9 FFmpeg patch

Browse Source 
Isn't needed as for:
https://github.com/OpenVisualCloud/SVT-VP9/issues/167#event-9831723954
This commit is contained in:
Martin Pulec
2023-07-17 10:40:25 +02:00
parent 7859e0936d
commit 98df12be3c
2 changed files with 0 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.github/scripts/Linux/download_build_ffmpeg.sh vendored
View File

@@ -26,7 +26,6 @@ install_svt() {
( 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 )
# if patch apply fails, try increasing $FFMPEG_GIT_DEPTH
git am -3 SVT-HEVC/ffmpeg_plugin/master-*.patch
patch SVT-VP9/ffmpeg_plugin/master-*.patch < "$GITHUB_WORKSPACE/.github/scripts/Linux/tmp/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch.patch"
git am -3 SVT-VP9/ffmpeg_plugin/master-*.patch
}

34
.github/scripts/Linux/tmp/0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch.patch vendored
View File

@@ -1,34 +0,0 @@
1c1
< From 1317fc51792caa70ae8f08224367bc6bf2e3857e Mon Sep 17 00:00:00 2001
---
> From 8eadc2a999ce6bc512053e1a28f6df3c785930fb Mon Sep 17 00:00:00 2001
20c20
< index 932805ccf3..45306434fb 100755
---
> index 8980cec7ee..09f6f5e948 100755
47c47
< @@ -6715,6 +6718,7 @@ enabled libvpx && {
---
> @@ -6721,6 +6724,7 @@ enabled libvpx && {
56c56
< index 389253f5d0..1573ae4c34 100644
---
> index abae4909d2..019945d4bc 100644
61,62c61,62
< OBJS-$(CONFIG_LIBVPX_VP9_DECODER) += libvpxdec.o libvpx.o
< OBJS-$(CONFIG_LIBVPX_VP9_ENCODER) += libvpxenc.o libvpx.o
---
> OBJS-$(CONFIG_LIBVPX_VP9_DECODER) += libvpxdec.o
> OBJS-$(CONFIG_LIBVPX_VP9_ENCODER) += libvpxenc.o
68c68
< index e593ad19af..a5396c0477 100644
---
> index 385ee34803..37b9992778 100644
74c74
< extern FFCodec ff_libvpx_vp9_decoder;
---
> extern const FFCodec ff_libvpx_vp9_decoder;
786c786
< 2.39.1
---
> 2.40.0