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

GitHub CI [Linux, FFmpeg]: use 3-way merge to apply SVT HEVC patch

Browse Source 
Now it applies cleanly.
This commit is contained in:
Martin Pulec
2021-07-13 09:22:00 +02:00
parent 2e0a0e8814
commit 609f7a232d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,7 +13,7 @@ install_libvpx() {
install_svt() {
( git clone --depth 1 https://github.com/OpenVisualCloud/SVT-HEVC && cd SVT-HEVC/Build/linux && ./build.sh release && cd Release && make -j $(nproc) && sudo make install || exit 1 )
( git clone --depth 1 https://github.com/OpenVisualCloud/SVT-AV1 && cd SVT-AV1 && cd Build && cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release && make -j $(nproc) && sudo make install || exit 1 )
git apply SVT-HEVC/ffmpeg_plugin/master-*.patch
git apply -3 SVT-HEVC/ffmpeg_plugin/master-*.patch
}
# The NVENC API implies respective driver version (see libavcodec/nvenc.c), consider capping the version for backward compatibility
@@ -23,7 +23,7 @@ install_nv_codec_headers() {
}
rm -rf /var/tmp/ffmpeg
git clone --depth 1 https://git.ffmpeg.org/ffmpeg.git /var/tmp/ffmpeg
git clone --depth 1000 https://git.ffmpeg.org/ffmpeg.git /var/tmp/ffmpeg # depth 1000 useful for 3-way merges
cd /var/tmp/ffmpeg
( git clone --depth 1 -b nasm-2.13.xx https://github.com/sezero/nasm.git && cd nasm && ./autogen.sh && ./configure && make nasm.1 && make ndisasm.1 && make -j $(nproc) && sudo make install || exit 1 )
( git clone --depth 1 http://git.videolan.org/git/x264.git && cd x264 && ./configure --disable-static --enable-shared && make -j $(nproc) && sudo make install || exit 1 )