diff --git a/Makefile b/Makefile index 0f763a0..c3267ab 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ GO ?= go .DEFAULT_GOAL := default -version := v0.0.2 +version := v0.0.1 VS_PYTORCH_VERSION := v0.0.1 .PHONY: tidy diff --git a/common/version/version.go b/common/version/version.go index b0bb12e..091f23d 100644 --- a/common/version/version.go +++ b/common/version/version.go @@ -1,3 +1,3 @@ package version -const FINALRIP_VERSION = "v0.0.2" +const FINALRIP_VERSION = "v0.0.1" diff --git a/module/ffmpeg/merge.go b/module/ffmpeg/merge.go index 89eeb05..e026f4d 100644 --- a/module/ffmpeg/merge.go +++ b/module/ffmpeg/merge.go @@ -45,9 +45,9 @@ func MergeVideo(originFile string, inputFiles []string, outputPath string) error log.Logger.Infof("Merge video output: %s", out) // 拼接音频 - commandStr = fmt.Sprintf("ffmpeg -i %s -i %s -map 0:a -map 0:s -map 1:v:0 -c copy %s", originFile, tempVideoOutputPath, outputPath) //nolint: lll + commandStr = fmt.Sprintf("ffmpeg -i %s -i %s -map 0:a:0 -map 1:v:0 -c copy %s", originFile, tempVideoOutputPath, outputPath) //nolint: lll log.Logger.Infof("Merge audio command: %s", commandStr) - cmd = exec.Command("ffmpeg", "-i", originFile, "-i", tempVideoOutputPath, "-map", "0:a", "-map", "0:s", "-map", "1:v:0", "-c", "copy", outputPath) //nolint: lll + cmd = exec.Command("ffmpeg", "-i", originFile, "-i", tempVideoOutputPath, "-map", "0:a:0", "-map", "1:v:0", "-c", "copy", outputPath) //nolint: lll out, err = cmd.CombinedOutput() if err != nil { log.Logger.Errorf("Merge audio failed: %v", err)