Skip to content

Commit 4b5eaeb

Browse files
committed
Revert "GitHub CI C/C++ Lin. FFmpeg: disable SVT HEVC/VP9"
This reverts commit 9fbd18b.
1 parent c983447 commit 4b5eaeb

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

.github/scripts/Linux/download_build_ffmpeg.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ install_libvpx() {
1212

1313
FFMPEG_GIT_DEPTH=5000 # greater depth is useful for 3-way merges
1414
install_svt() {
15-
#( 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 )
15+
( 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 )
1616
( 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 )
17-
#( 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 )
17+
( 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 )
1818
# if patch apply fails, try increasing $FFMPEG_GIT_DEPTH
19-
#git apply -3 SVT-HEVC/ffmpeg_plugin/master-*.patch
20-
#git apply -3 SVT-VP9/ffmpeg_plugin/master-*.patch
19+
git apply -3 SVT-HEVC/ffmpeg_plugin/master-*.patch
20+
git apply -3 SVT-VP9/ffmpeg_plugin/master-*.patch
2121
}
2222

2323
# The NVENC API implies respective driver version (see libavcodec/nvenc.c) - 455.28 (Linux) / 456.71 (Windows) for v11.0
@@ -43,8 +43,8 @@ done
4343
--enable-libdav1d \
4444
--enable-librav1e \
4545
--enable-libsvtav1 \
46-
#--enable-libsvthevc \
47-
#--enable-libsvtvp9 \
46+
--enable-libsvthevc \
47+
--enable-libsvtvp9 \
4848

4949
make -j $(nproc)
5050
sudo make install

.github/scripts/Linux/install_ffmpeg.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ cd /var/tmp/ffmpeg
66
( cd nv-codec-headers && sudo make install )
77
( cd aom/build && sudo cmake --install . )
88
( cd SVT-AV1/Build && sudo make install )
9-
#( cd SVT-HEVC/Build/linux/Release && sudo make install || exit 1 )
10-
#( cd SVT-VP9/Build && sudo make install || exit 1 )
9+
( cd SVT-HEVC/Build/linux/Release && sudo make install || exit 1 )
10+
( cd SVT-VP9/Build && sudo make install || exit 1 )
1111
sudo make install
1212
sudo ldconfig

0 commit comments

Comments
 (0)