Mirror-Tools
/
N_m3u8DL-RE
mirror of https://github.com/nilaoda/N_m3u8DL-RE.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

去除多余判断

This commit is contained in:
nilaoda 2024-11-30 22:22:15 +08:00
parent 7463915fbb
commit bc8b5a92a9
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/N_m3u8DL-RE/Program.cs
View File

@ -116,11 +116,6 @@ internal class Program
option.DecryptionEngine = DecryptEngine.SHAKA_PACKAGER; option.DecryptionEngine = DecryptEngine.SHAKA_PACKAGER;
} }
if (option is { UseShakaPackager: true, DecryptionEngine: not DecryptEngine.SHAKA_PACKAGER })
{
throw new ArgumentException("UseShakaPackager and Mp4DecryptEngine not match!");
}
// LivePipeMux开启时 LiveRealTimeMerge必须开启 // LivePipeMux开启时 LiveRealTimeMerge必须开启
if (option is { LivePipeMux: true, LiveRealTimeMerge: false }) if (option is { LivePipeMux: true, LiveRealTimeMerge: false })
{ {
@ -139,7 +134,7 @@ internal class Program
Logger.Extra($"ffmpeg => {option.FFmpegBinaryPath}"); Logger.Extra($"ffmpeg => {option.FFmpegBinaryPath}");
// 预先检查mkvmerge // 预先检查mkvmerge
if (option.MuxOptions != null && option.MuxOptions.UseMkvmerge && option.MuxAfterDone) if (option is { MuxOptions.UseMkvmerge: true, MuxAfterDone: true })
{ {
option.MkvmergeBinaryPath ??= GlobalUtil.FindExecutable("mkvmerge"); option.MkvmergeBinaryPath ??= GlobalUtil.FindExecutable("mkvmerge");
if (string.IsNullOrEmpty(option.MkvmergeBinaryPath) || !File.Exists(option.MkvmergeBinaryPath)) if (string.IsNullOrEmpty(option.MkvmergeBinaryPath) || !File.Exists(option.MkvmergeBinaryPath))