Skip to content

Commit 933d399

Browse files
committed
Remove v in version and add locateFile func to fix worker script issue
1 parent ef47d06 commit 933d399

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

src/browser/defaultOptions.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ const { devDependencies } = require('../../package.json');
77
module.exports = {
88
corePath: (typeof process !== 'undefined' && process.env.FFMPEG_ENV === 'development')
99
? resolveURL('/node_modules/@ffmpeg/core/dist/ffmpeg-core.js')
10-
: `https://unpkg.com/@ffmpeg/core@v${devDependencies['@ffmpeg/core'].substring(1)}/dist/ffmpeg-core.js`,
10+
: `https://unpkg.com/@ffmpeg/core@${devDependencies['@ffmpeg/core'].substring(1)}/dist/ffmpeg-core.js`,
1111
};

src/createFFmpeg.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,14 @@ module.exports = (_options = {}) => {
5353
Core = await createFFmpegCore({
5454
printErr: (message) => parseMessage({ type: 'fferr', message }),
5555
print: (message) => parseMessage({ type: 'ffout', message }),
56+
locateFile: (path, prefix) => {
57+
if (typeof window !== 'undefined'
58+
&& typeof window.FFMPEG_CORE_WORKER_SCRIPT !== 'undefined'
59+
&& path.endsWith('ffmpeg-core.worker.js')) {
60+
return window.FFMPEG_CORE_WORKER_SCRIPT;
61+
}
62+
return prefix + path;
63+
},
5664
});
5765
ffmpeg = Core.cwrap('proxy_main', 'number', ['number', 'number']);
5866
log('info', 'ffmpeg-core loaded');

0 commit comments

Comments
 (0)