Support a local working directory copy of ffmpeg. Closes #276
This commit is contained in:
parent
131675bc03
commit
2b8aea8797
@ -28,6 +28,14 @@ func getDefaults() config {
|
||||
}
|
||||
|
||||
func getDefaultFFMpegPath() string {
|
||||
// First look to see if ffmpeg is in the current working directory
|
||||
localCopy := "./ffmpeg"
|
||||
hasLocalCopyError := verifyFFMpegPath(localCopy)
|
||||
if hasLocalCopyError == nil {
|
||||
// No error, so all is good. Use the local copy.
|
||||
return localCopy
|
||||
}
|
||||
|
||||
cmd := exec.Command("which", "ffmpeg")
|
||||
out, err := cmd.CombinedOutput()
|
||||
if err != nil {
|
||||
|
@ -1,4 +1,4 @@
|
||||
package ffmpeg
|
||||
package config
|
||||
|
||||
import (
|
||||
"errors"
|
||||
@ -6,8 +6,8 @@ import (
|
||||
"os"
|
||||
)
|
||||
|
||||
//VerifyFFMpegPath verifies that the path exists, is a file, and is executable
|
||||
func VerifyFFMpegPath(path string) error {
|
||||
//verifyFFMpegPath verifies that the path exists, is a file, and is executable
|
||||
func verifyFFMpegPath(path string) error {
|
||||
stat, err := os.Stat(path)
|
||||
|
||||
if os.IsNotExist(err) {
|
Loading…
Reference in New Issue
Block a user