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

Partially revert "GitHub CI C/C++ Lin. FFmpeg: disable SVT HEVC/VP9"

Browse Source 
This partially reverts commit 9fbd18b53d.

Note: VP9 patch is still not working.
This commit is contained in:
Martin Pulec
2022-03-28 08:32:12 +02:00
parent 635b0b204b
commit 7f96dab49d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,11 +12,11 @@ install_libvpx() {
FFMPEG_GIT_DEPTH=5000 # greater depth is useful for 3-way merges
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-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 clone --depth 1 https://github.com/OpenVisualCloud/SVT-VP9.git && cd SVT-VP9/Build && cmake .. -DCMAKE_BUILD_TYPE=Release && make -j $(nproc) && sudo make install || exit 1 )
# if patch apply fails, try increasing $FFMPEG_GIT_DEPTH
#git apply -3 SVT-HEVC/ffmpeg_plugin/master-*.patch
git apply -3 SVT-HEVC/ffmpeg_plugin/master-*.patch
#git apply -3 SVT-VP9/ffmpeg_plugin/master-*.patch
}
@@ -43,7 +43,7 @@ done
--enable-libdav1d \
--enable-librav1e \
--enable-libsvtav1 \
#--enable-libsvthevc \
--enable-libsvthevc \
#--enable-libsvtvp9 \
make -j $(nproc)

2
.github/scripts/Linux/install_ffmpeg.sh vendored
View File

@@ -6,7 +6,7 @@ cd /var/tmp/ffmpeg
( cd nv-codec-headers && sudo make install )
( cd aom/build && sudo cmake --install . )
( cd SVT-AV1/Build && sudo make install )
#( cd SVT-HEVC/Build/linux/Release && sudo make install || exit 1 )
( cd SVT-HEVC/Build/linux/Release && sudo make install || exit 1 )
#( cd SVT-VP9/Build && sudo make install || exit 1 )
sudo make install
sudo ldconfig