Skip to content

Commit

Permalink
revert: copy subs (#39)
Browse files Browse the repository at this point in the history
  • Loading branch information
Tohrusky authored Oct 27, 2024
1 parent f4854a5 commit fd8f718
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion common/version/version.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
package version

const FINALRIP_VERSION = "v0.0.2"
const FINALRIP_VERSION = "v0.0.1"
4 changes: 2 additions & 2 deletions module/ffmpeg/merge.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit fd8f718

Please sign in to comment.