OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix ffmpeg version checker

pull/4051/head
Chocobozzz 2021-05-06 16:39:17 +02:00
parent 16de9ff46d
commit 60f1f61579
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/helpers/ffmpeg-utils.ts
View File

@ -679,10 +679,16 @@ function getFFmpegVersion () {
return execPromise(`${ffmpegPath} -version`) return execPromise(`${ffmpegPath} -version`)
.then(stdout => { .then(stdout => {
const parsed = stdout.match(/ffmpeg version .?(\d+\.\d+\.\d+)/) const parsed = stdout.match(/ffmpeg version .?(\d+\.\d+(\.\d+)?)/)
if (!parsed || !parsed[1]) return rej(new Error(`Could not find ffmpeg version in ${stdout}`)) if (!parsed || !parsed[1]) return rej(new Error(`Could not find ffmpeg version in ${stdout}`))
return res(parsed[1]) // Fix ffmpeg version that does not include patch version (4.4 for example)
let version = parsed[1]
if (version.match(/^\d+\.\d+/)) {
version += '.0'
}
return res(version)
}) })
.catch(err => rej(err)) .catch(err => rej(err))
}) })