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");