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

Merge from master

Browse Source
This commit is contained in:
WithoutPants
2019-10-18 08:15:45 +11:00
parent a401a7880e c8e0ac7d20
commit 1ac6703d7f
216 changed files with 817 additions and 35896 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/ffmpeg/encoder.go
View File

@@ -113,7 +113,7 @@ func (e *Encoder) run(probeResult VideoFile, args []string) (string, error) {
err = waitAndDeregister(probeResult.Path, cmd)
if err != nil {
logger.Errorf("ffmpeg error when running command <%s>", strings.Join(cmd.Args, " "))
logger.Errorf("ffmpeg error when running command <%s>: %s", strings.Join(cmd.Args, " "), stdoutString)
return stdoutString, err
}