From 357c0afb3bc3edc3281a77d379223fe437a00178 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Sat, 10 Jan 2026 22:51:48 +0800
Subject: [PATCH] =?UTF-8?q?feat(util):=20=E6=B7=BB=E5=8A=A0FFmpeg=E9=80=9A?=
 =?UTF-8?q?=E7=94=A8=E5=8F=82=E6=95=B0=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 通过FFMPEG_COMMON_ARGS环境变量传入通用FFmpeg参数
- 在执行FFmpeg命令时合并环境变量中的通用参数
- 保持原有FFmpeg参数传递机制不变
---
 util/ffmpeg.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/util/ffmpeg.py b/util/ffmpeg.py
index 7ec3a05..1fd8fbf 100644
--- a/util/ffmpeg.py
+++ b/util/ffmpeg.py
@@ -64,7 +64,9 @@ def start_render(ffmpeg_task: FfmpegTask):
             ffmpeg_task.set_output_file(ffmpeg_task.input_file[0])
             span.set_status(Status(StatusCode.OK))
             return True
-        ffmpeg_process = subprocess.run(["ffmpeg", "-progress", "-", "-loglevel", "error", *ffmpeg_args], stderr=subprocess.PIPE, **subprocess_args(True))
+        # 通过环境变量传入通用FFmpeg参数
+        common_args = os.getenv("FFMPEG_COMMON_ARGS", "").split() if os.getenv("FFMPEG_COMMON_ARGS") else []
+        ffmpeg_process = subprocess.run(["ffmpeg", "-progress", "-", "-loglevel", "error", *common_args, *ffmpeg_args], stderr=subprocess.PIPE, **subprocess_args(True))
         span.set_attribute("ffmpeg.args", json.dumps(ffmpeg_process.args))
         logger.info(" ".join(ffmpeg_process.args))
         ffmpeg_final_out = handle_ffmpeg_output(ffmpeg_process.stdout)