Mirrors/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-17 04:14:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixes FFMPEG failure edge case

Browse Source
This commit is contained in:
Stash Dev
2019-03-28 16:29:45 -07:00
parent abbc2fa230
commit 71f8fc9dd5
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/ffmpeg/encoder.go
View File

@@ -4,6 +4,7 @@ import (
"github.com/stashapp/stash/pkg/logger" "github.com/stashapp/stash/pkg/logger"
"io/ioutil" "io/ioutil"
"os/exec" "os/exec"
"strings"
) )
type Encoder struct { type Encoder struct {
@@ -53,6 +54,7 @@ func (e *Encoder) run(probeResult VideoFile, args []string) (string, error) {
stdoutString := string(stdoutData) stdoutString := string(stdoutData)
if err := cmd.Wait(); err != nil { if err := cmd.Wait(); err != nil {
logger.Errorf("ffmpeg error when running command <%s>", strings.Join(cmd.Args, " "))
return stdoutString, err return stdoutString, err
} }

1
pkg/ffmpeg/encoder_marker.go
View File

@@ -18,6 +18,7 @@ func (e *Encoder) SceneMarkerVideo(probeResult VideoFile, options SceneMarkerOpt
"-ss", strconv.Itoa(options.Seconds), "-ss", strconv.Itoa(options.Seconds),
"-t", "20", "-t", "20",
"-i", probeResult.Path, "-i", probeResult.Path,
"-max_muxing_queue_size", "1024", // https://trac.ffmpeg.org/ticket/6375
"-c:v", "libx264", "-c:v", "libx264",
"-profile:v", "high", "-profile:v", "high",
"-level", "4.2", "-level", "4.2",