Fixes FFMPEG failure edge case

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

View File

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

View File

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