LogalDeveloper/owncast
0
Fork 0
Code Activity

Fix pwd no longer being included in ffmpeg binary search (#4749)

Browse Source 
* fix(go): fix pwd no longer being included in ffmpeg binary search. Closes #4747

* fix: updates per feedback
This commit is contained in:
Gabe Kangas
2026-01-17 14:23:39 -08:00
committed by GitHub
parent 93868574a5
commit 0ff73d5e1e
2 changed files with 102 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
utils/utils.go
+9 -4
View File
@@ -260,10 +260,15 @@ func ValidatedFfmpegPath(ffmpegPath string) string {
log.Warnln(ffmpegPath, "is an invalid path to ffmpeg will try to use a copy in your path, if possible")
}
// Look for ffmpeg in the system path or in the current working directory.
ffmpegPath, err := exec.LookPath("ffmpeg")
if ffmpegPath == "" || (err != nil && !errors.Is(err, exec.ErrDot)) || VerifyFFMpegPath(ffmpegPath) != nil {
log.Fatalln("Unable to locate ffmpeg. Either install it globally on your system or put the ffmpeg binary in the same directory as Owncast. The binary must be named ffmpeg.")
// First, check for ffmpeg in the current working directory.
if err := VerifyFFMpegPath("./ffmpeg"); err == nil {
ffmpegPath = "./ffmpeg"
} else {
// Fall back to looking for ffmpeg in the system path.
ffmpegPath, err = exec.LookPath("ffmpeg")
if err != nil || VerifyFFMpegPath(ffmpegPath) != nil {
log.Fatalln("Unable to locate ffmpeg. Either install it globally on your system or put the ffmpeg binary in the same directory as Owncast. The binary must be named ffmpeg.")
}
}
// Resolve to an absolute path.