waveringana/embedder
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

commit

Browse source
This commit is contained in:
waveringana 2023-11-05 15:13:25 -05:00
parent 7a86ad95b4
commit afb3a2d0fd
3 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/lib/ffmpeg.ts
View file

@ -157,6 +157,7 @@ export const ffmpegConvert = (path: string, filename: string, extension: string)
reject(`Submitted file is neither a video nor a gif: ${path}`);
});
}
<<<<<<< HEAD
return new Promise<void>((resolve, reject) => {
ffmpeg()
@ -182,4 +183,7 @@ export const ffProbe = (path: string, filename: string, extension: string) => {
resolve(data);
});
});
}
}
=======
};**/
>>>>>>> f730b3d (commit)