Skip to content

Commit 9e41c80

Browse files
Andarwinuxshinchiro
authored andcommitted
ffmpeg: disable davs2 and uavs3d
1 parent 7d0363b commit 9e41c80

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

cmake/packages_check.cmake

+8
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ if(TARGET_CPU STREQUAL "x86_64")
4242
set(xxhash_cflags "-DXXH_X86DISPATCH_ALLOW_AVX=1")
4343
set(nvcodec_headers "nvcodec-headers")
4444
set(ffmpeg_cuda "--enable-cuda-llvm --enable-cuvid --enable-nvdec --enable-nvenc")
45+
set(ffmpeg_uavs3d "uavs3d")
46+
set(ffmpeg_uavs3d_cmd "--enable-libuavs3d")
47+
set(ffmpeg_davs2 "davs2")
48+
set(ffmpeg_davs2_cmd "--enable-libdavs2")
4549
elseif(TARGET_CPU STREQUAL "i686")
4650
set(dlltool_image "i386")
4751
set(vulkan_asm "-DUSE_MASM=OFF")
@@ -52,6 +56,10 @@ elseif(TARGET_CPU STREQUAL "i686")
5256
set(xxhash_cflags "-DXXH_X86DISPATCH_ALLOW_AVX=1")
5357
set(nvcodec_headers "nvcodec-headers")
5458
set(ffmpeg_cuda "--enable-cuda-llvm --enable-cuvid --enable-nvdec --enable-nvenc")
59+
set(ffmpeg_uavs3d "uavs3d")
60+
set(ffmpeg_uavs3d_cmd "--enable-libuavs3d")
61+
set(ffmpeg_davs2 "davs2")
62+
set(ffmpeg_davs2_cmd "--enable-libdavs2")
5563
elseif(TARGET_CPU STREQUAL "aarch64")
5664
set(dlltool_image "arm64")
5765
set(vulkan_asm "-DUSE_GAS=ON")

packages/ffmpeg.cmake

+4-4
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ ExternalProject_Add(ffmpeg
4141
svtav1
4242
dav1d
4343
vapoursynth
44-
uavs3d
45-
davs2
44+
${ffmpeg_uavs3d}
45+
${ffmpeg_davs2}
4646
rubberband
4747
libva
4848
openal-soft
@@ -89,8 +89,8 @@ ExternalProject_Add(ffmpeg
8989
--enable-libaom
9090
--enable-libsvtav1
9191
--enable-libdav1d
92-
--enable-libdavs2
93-
--enable-libuavs3d
92+
${ffmpeg_davs2_cmd}
93+
${ffmpeg_uavs3d_cmd}
9494
--enable-libxvid
9595
--enable-libzimg
9696
--enable-openssl

0 commit comments

Comments
 (0)