Skip to content

Commit a8ce737

Browse files
committed
update
1 parent a240698 commit a8ce737

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,5 @@ go.mod
2222
go.sum
2323
logs
2424
tmp
25-
download
25+
download
26+
创建tag版本

dl/dowloader.go

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -477,11 +477,11 @@ func AddWaterMarker(ffmpegPath string, fTemp string, fPath string, markerPath st
477477
left = 10
478478
}
479479
mp4Path := fPath
480-
videoInfo := Info(ffmpegPath, fTemp)
481-
br := videoInfo.Br
482-
if br == 0 {
483-
br = 1000
484-
}
480+
// videoInfo := Info(ffmpegPath, fTemp)
481+
// br := videoInfo.Br
482+
// if br == 0 {
483+
// br = 1000
484+
// }
485485
// if width <= 1280 {
486486
// width = 600
487487
// height = 30
@@ -529,10 +529,14 @@ func Cmd(showDetail bool, name string, args ...string) error {
529529
cmd.Stderr = nil
530530

531531
// 执行命令
532-
err := cmd.Run()
532+
err := cmd.Start()
533533
if err != nil {
534534
return err
535535
}
536+
err = cmd.Wait()
537+
if err != nil {
538+
panic(err)
539+
}
536540
return nil
537541
// stderrPipe, err := cmd.StderrPipe()
538542
// if err != nil {

0 commit comments

Comments
 (0)