From f4854a5e4ed6affd2f5c4f9ff16b00661ba9c98e Mon Sep 17 00:00:00 2001 From: Tohru <65994850+Tohrusky@users.noreply.github.com> Date: Sun, 27 Oct 2024 06:48:25 +0000 Subject: [PATCH] doc: fix README.md (#38) * doc: fix README.md * feat: copy subs --- Makefile | 2 +- README.md | 4 ++-- common/version/version.go | 2 +- module/ffmpeg/merge.go | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index c3267ab..0f763a0 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ GO ?= go .DEFAULT_GOAL := default -version := v0.0.1 +version := v0.0.2 VS_PYTORCH_VERSION := v0.0.1 .PHONY: tidy diff --git a/README.md b/README.md index e12e22f..15496f1 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,8 @@ a distributed video processing tool, based on FFmpeg and VapourSynth [![CI-test](https://github.com/TensoRaws/FinalRip/actions/workflows/CI-test.yml/badge.svg)](https://github.com/TensoRaws/FinalRip/actions/workflows/CI-test.yml) [![golangci-lint](https://github.com/TensoRaws/FinalRip/actions/workflows/golangci-lint.yml/badge.svg)](https://github.com/TensoRaws/FinalRip/actions/workflows/golangci-lint.yml) -[![Docker Build CI](https://github.com/TensoRaws/FinalRip/actions/workflows/Docker-CI.yml/badge.svg)](https://github.com/TensoRaws/FinalRip/actions/workflows/Docker-CI.yml) -[![Docker Build Release](https://github.com/TensoRaws/FinalRip/actions/workflows/Docker-Release.yml/badge.svg)](https://github.com/TensoRaws/FinalRip/actions/workflows/Docker-Release.yml) +[![Docker Build CI](https://github.com/TensoRaws/FinalRip/actions/workflows/CI-docker.yml/badge.svg)](https://github.com/TensoRaws/FinalRip/actions/workflows/CI-docker.yml) +[![Release](https://github.com/TensoRaws/FinalRip/actions/workflows/Release.yml/badge.svg)](https://github.com/TensoRaws/FinalRip/actions/workflows/Release.yml) [![CircleCI](https://dl.circleci.com/status-badge/img/circleci/RJWBNXdmdaDACvcacXFQ3e/Ge3dVaX4GmktGiL9Jb1ADB/tree/main.svg?style=svg)](https://dl.circleci.com/status-badge/redirect/circleci/RJWBNXdmdaDACvcacXFQ3e/Ge3dVaX4GmktGiL9Jb1ADB/tree/main) ### Architecture diff --git a/common/version/version.go b/common/version/version.go index 091f23d..b0bb12e 100644 --- a/common/version/version.go +++ b/common/version/version.go @@ -1,3 +1,3 @@ package version -const FINALRIP_VERSION = "v0.0.1" +const FINALRIP_VERSION = "v0.0.2" diff --git a/module/ffmpeg/merge.go b/module/ffmpeg/merge.go index e026f4d..89eeb05 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:0 -map 1:v:0 -c copy %s", originFile, tempVideoOutputPath, outputPath) //nolint: lll + 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 log.Logger.Infof("Merge audio command: %s", commandStr) - cmd = exec.Command("ffmpeg", "-i", originFile, "-i", tempVideoOutputPath, "-map", "0:a:0", "-map", "1:v:0", "-c", "copy", outputPath) //nolint: lll + cmd = exec.Command("ffmpeg", "-i", originFile, "-i", tempVideoOutputPath, "-map", "0:a", "-map", "0:s", "-map", "1:v:0", "-c", "copy", outputPath) //nolint: lll out, err = cmd.CombinedOutput() if err != nil { log.Logger.Errorf("Merge audio failed: %v", err)