From 070f7bd21eee024a5b430188a36914bd8241abdc Mon Sep 17 00:00:00 2001 From: dijunkun Date: Wed, 29 Nov 2023 22:57:29 -0800 Subject: [PATCH] Disable ffmpeg openh264 codec --- thirdparty/ffmpeg/xmake.lua | 5 +++-- thirdparty/projectx | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/thirdparty/ffmpeg/xmake.lua b/thirdparty/ffmpeg/xmake.lua index b775580..32b7e02 100644 --- a/thirdparty/ffmpeg/xmake.lua +++ b/thirdparty/ffmpeg/xmake.lua @@ -42,14 +42,15 @@ package("ffmpeg") add_configs("vdpau", {description = "Enable vdpau library.", default = false, type = "boolean"}) add_configs("hardcoded-tables", {description = "Enable hardcoded tables.", default = true, type = "boolean"}) add_configs("asm", {description = "Enable asm", default = false, type = "boolean"}) - add_configs("libopenh264", {description = "Enable libopenh264", default = true, type = "boolean"}) + add_configs("libopenh264", {description = "Enable libopenh264", default = false, type = "boolean"}) end add_links("avfilter", "avdevice", "avformat", "avcodec", "swscale", "swresample", "avutil") if is_plat("macosx") then add_frameworks("CoreFoundation", "Foundation", "CoreVideo", "CoreMedia", "AudioToolbox", "VideoToolbox", "Security") elseif is_plat("linux") then - add_syslinks("pthread", "openh264") + -- add_syslinks("pthread", "openh264") + add_syslinks("pthread") end if is_plat("linux", "macosx") then diff --git a/thirdparty/projectx b/thirdparty/projectx index 079cedd..3eef1f8 160000 --- a/thirdparty/projectx +++ b/thirdparty/projectx @@ -1 +1 @@ -Subproject commit 079ceddae7ff453236bdca8d26a0ec389b59c4c3 +Subproject commit 3eef1f8d8490dae1b5d4e52b95ecc313e3d9931b