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:16:30 -05:00
parent afb3a2d0fd
commit 807e50388a
1 changed files with 0 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/lib/ffmpeg.ts
View file

@ -157,7 +157,6 @@ 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()
@ -184,6 +183,3 @@ export const ffProbe = (path: string, filename: string, extension: string) => {
});
});
}
=======
};**/
>>>>>>> f730b3d (commit)