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

Revert "CI: patch SVT-HEVC patch"

Browse Source 
This reverts commit 842a86b82f.

no more needed, patch was rebased in upstream
This commit is contained in:
Martin Pulec
2023-02-08 12:47:31 +01:00
parent 34d262925f
commit 2963393f3d
3 changed files with 0 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,7 +29,6 @@ install_svt() {
( git clone --depth 1 https://gitlab.com/AOMediaCodec/SVT-AV1.git && cd SVT-AV1 && cd Build && cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release && cmake --build . --parallel && sudo cmake --install . || exit 1 )
( 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
patch SVT-HEVC/ffmpeg_plugin/master-*.patch < "$GITHUB_WORKSPACE/.github/scripts/Linux/tmp/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch.patch"
git apply -3 SVT-HEVC/ffmpeg_plugin/master-*.patch
git apply -3 SVT-VP9/ffmpeg_plugin/master-*.patch
}

35
.github/scripts/Linux/tmp/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch.patch vendored
View File

@@ -1,35 +0,0 @@
1c1
< From 20d8a694d7ea7bba69e3db5f773903ae2ecd4d0f Mon Sep 17 00:00:00 2001
---
> From 2e8653bc6482ae09e68ba64776d2fe531b2dcd41 Mon Sep 17 00:00:00 2001
22c22
< index 0f3042b8a7..655eaf6848 100755
---
> index e6470dc0..0988fb7c 100755
41,42c41
< @@ -3399,6 +3401,7 @@ libx264_encoder_select="atsc_a53"
< libx264rgb_encoder_deps="libx264"
---
> @@ -3400,6 +3402,7 @@ libx264rgb_encoder_deps="libx264"
44a44
> libx265_encoder_select="atsc_a53"
49c49
< @@ -6680,6 +6683,7 @@ enabled libssh && require_pkg_config libssh libssh libssh/sftp.h sftp
---
> @@ -6681,6 +6684,7 @@ enabled libssh && require_pkg_config libssh libssh libssh/sftp.h sftp
58c58
< index 94dc75a1b2..4df3686f57 100644
---
> index 94dc75a1..4df3686f 100644
70c70
< index f5ec3bc6e1..b82bae5ed9 100644
---
> index f5ec3bc6..b82bae5e 100644
83c83
< index 0000000000..739144ca0c
---
> index 00000000..739144ca
673c673
< 2.38.1
---
> 2.17.1

1
.github/scripts/Linux/tmp/README.txt vendored
View File

@@ -1 +0,0 @@
TOREMOVE - temporary workaround