From d8073368700abd363d7a814485451f7d4fa72204 Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 13 Oct 2022 23:50:43 +0800 Subject: [PATCH] improve ffmpeg (#1529) --- packages/f/ffmpeg/xmake.lua | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/f/ffmpeg/xmake.lua b/packages/f/ffmpeg/xmake.lua index a6f330a27..2e9979d74 100644 --- a/packages/f/ffmpeg/xmake.lua +++ b/packages/f/ffmpeg/xmake.lua @@ -27,7 +27,7 @@ package("ffmpeg") add_versions("git:5.1.1", "n5.1.1") add_versions("git:5.0.1", "n5.0.1") add_versions("git:4.0.2", "n4.0.2") - + add_configs("gpl", {description = "Enable GPL code", default = true, type = "boolean"}) add_configs("ffprobe", {description = "Enable ffprobe program.", default = false, type = "boolean"}) add_configs("ffmpeg", {description = "Enable ffmpeg program.", default = true, type = "boolean"}) @@ -38,6 +38,8 @@ package("ffmpeg") add_configs("libx264", {description = "Enable libx264 decoder.", default = false, type = "boolean"}) add_configs("libx265", {description = "Enable libx265 decoder.", default = false, type = "boolean"}) add_configs("iconv", {description = "Enable libiconv library.", default = false, type = "boolean"}) + add_configs("vaapi", {description = "Enable vaapi library.", default = false, type = "boolean"}) + add_configs("vdpau", {description = "Enable vdpau library.", default = false, type = "boolean"}) add_configs("hardcoded-tables", {description = "Enable hardcoded tables.", default = true, type = "boolean"}) end @@ -138,9 +140,6 @@ package("ffmpeg") else table.insert(configs, "--disable-debug") end - if package:config("pic") ~= false then - table.insert(configs, "--enable-pic") - end if package:is_plat("android") then import("core.base.option") import("core.tool.toolchain")