From 561e2a6aa8558d10f31111d43b96fe6ea4910cae Mon Sep 17 00:00:00 2001 From: nilaoda Date: Tue, 23 Aug 2022 00:03:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=80=89=E9=A1=B9=E6=A3=80?= =?UTF-8?q?=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/N_m3u8DL-RE.Common/Resource/StaticText.cs | 2 +- src/N_m3u8DL-RE/Program.cs | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/N_m3u8DL-RE.Common/Resource/StaticText.cs b/src/N_m3u8DL-RE.Common/Resource/StaticText.cs index 924b8af..2d296fb 100644 --- a/src/N_m3u8DL-RE.Common/Resource/StaticText.cs +++ b/src/N_m3u8DL-RE.Common/Resource/StaticText.cs @@ -242,7 +242,7 @@ namespace N_m3u8DL_RE.Common.Resource ( zhCN: "所有工作完成时尝试使用ffmpeg混流分离的音视频(默认容器: mkv)", zhTW: "所有工作完成時嘗試使用ffmpeg混流分離的影音(默認容器: mkv)", - enUS: "When all works is done, try to use ffmpeg to mux the separated streams.(Default: mkv)" + enUS: "When all works is done, try to use ffmpeg to mux the separated streams.(Default container: mkv)" ), ["cmd_muxToMp4"] = new TextContainer ( diff --git a/src/N_m3u8DL-RE/Program.cs b/src/N_m3u8DL-RE/Program.cs index 990a7db..b8e6d1a 100644 --- a/src/N_m3u8DL-RE/Program.cs +++ b/src/N_m3u8DL-RE/Program.cs @@ -55,6 +55,11 @@ namespace N_m3u8DL_RE throw new ArgumentException("Can't use mkvmerge to make mp4!"); } + if (option.MuxToMp4 && !option.MuxAfterDone) + { + throw new ArgumentException("Can't enable MuxToMp4 when MuxAfterDone is false!"); + } + //预先检查ffmpeg if (option.FFmpegBinaryPath == null) option.FFmpegBinaryPath = GlobalUtil.FindExecutable("ffmpeg");