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

6
pkg/api/routes_scene.go
View File

@@ -62,9 +62,13 @@ func (rs sceneRoutes) Stream(w http.ResponseWriter, r *http.Request) {
return
}
// start stream based on query param, if provided
r.ParseForm()
startTime := r.Form.Get("start")
encoder := ffmpeg.NewEncoder(manager.GetInstance().FFMPEGPath)
stream, process, err := encoder.StreamTranscode(*videoFile)
stream, process, err := encoder.StreamTranscode(*videoFile, startTime)
if err != nil {
logger.Errorf("[stream] error transcoding video file: %s", err.Error())
return