yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-05 19:42:24 +02:00
Code Issues Releases Wiki Activity

Ensure ffmpeg is killed

Browse source
This commit is contained in:
Chocobozzz 2025-03-28 09:20:07 +01:00
parent 3e69a6ce19
commit 1a5c4ff11d
No known key found for this signature in database
GPG key ID: 583A612D890159BE
3 changed files with 21 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
server/core/lib/video-file.ts
View file

@ -303,8 +303,10 @@ export async function muxToMergeVideoFiles (options: {
logger.info(`Muxing files for video ${video.url}`, { inputs: inputsToLog, ...lTags(video.uuid) })
const ffmpegContainer = new FFmpegContainer(getFFmpegCommandWrapperOptions('vod'))
try {
await new FFmpegContainer(getFFmpegCommandWrapperOptions('vod')).mergeInputs({
await ffmpegContainer.mergeInputs({
inputs,
output,
logError: false,
@ -329,6 +331,8 @@ export async function muxToMergeVideoFiles (options: {
}
throw err
} finally {
ffmpegContainer.forceKill()
}
} finally {
for (const destination of tmpDestinations) {