commit
This commit is contained in:
parent
afb3a2d0fd
commit
807e50388a
1 changed files with 0 additions and 4 deletions
|
@ -157,7 +157,6 @@ export const ffmpegConvert = (path: string, filename: string, extension: string)
|
||||||
reject(`Submitted file is neither a video nor a gif: ${path}`);
|
reject(`Submitted file is neither a video nor a gif: ${path}`);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
<<<<<<< HEAD
|
|
||||||
|
|
||||||
return new Promise<void>((resolve, reject) => {
|
return new Promise<void>((resolve, reject) => {
|
||||||
ffmpeg()
|
ffmpeg()
|
||||||
|
@ -184,6 +183,3 @@ export const ffProbe = (path: string, filename: string, extension: string) => {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
=======
|
|
||||||
};**/
|
|
||||||
>>>>>>> f730b3d (commit)
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue