Skip to content

Commit 2d2a06b

Browse files
Use path to find ffmpeg
1 parent c934ca4 commit 2d2a06b

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

Ffmpeg.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ return class.create(function(ffmpeg)
3535
end
3636

3737
function ffmpeg:configure(options)
38-
local ffDir = File:new(options.ffmpeg)
38+
local ffDir = File:new(options.ffmpeg or system.findExecutablePath('ffmpeg') or 'ffmpeg')
3939
if ffDir:isDirectory() then
4040
self.ffmpegPath = File:new(ffDir, getExecutableName('ffmpeg')):getPath()
4141
else

fcutSchema.lua

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ return {
5353
ffmpeg = {
5454
title = 'The ffmpeg path',
5555
type = 'string',
56-
default = (require('jls.lang.system').isWindows() and 'ffmpeg\\ffmpeg.exe' or '/usr/bin/ffmpeg'),
5756
},
5857
ffprobe = {
5958
title = 'The ffprobe path, the default value is computed from the ffmpeg path',

0 commit comments

Comments
 (0)