Skip to content

Commit d9cb1b8

Browse files
authored
Merge branch 'ffmpegwasm:main' into main
2 parents b7924ad + efac247 commit d9cb1b8

3 files changed

Lines changed: 3 additions & 2 deletions

File tree

apps/website/docs/migration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ table to transform 0.11.x to 0.12+
3030
{"0.11.x": "await ffmpeg.run(...args)", "0.12+": "await ffmpeg.exec([...args])", note: ""},
3131
{"0.11.x": "ffmpeg.FS.writeFile()", "0.12+": "await ffmpeg.writeFile()", note: ""},
3232
{"0.11.x": "ffmpeg.FS.readFile()", "0.12+": "await ffmpeg.readFile()", note: ""},
33-
{"0.11.x": "ffmpeg.exit()", "0.12+": "await ffmpeg.terminate()", note: ""},
33+
{"0.11.x": "ffmpeg.exit()", "0.12+": "ffmpeg.terminate()", note: ""},
3434
{"0.11.x": "ffmpeg.setLogger()", "0.12+": "ffmpeg.on(\"log\", () => {})", note: ""},
3535
{"0.11.x": "ffmpeg.setProgress()", "0.12+": "ffmpeg.on(\"progress\", () => {})", note: ""},
3636
{"0.11.x": "import { fetchFile } from '@ffmpeg/ffmpeg'", "0.12+": "import { fetchFile } from '@ffmpeg/util'", note: ""},

build/ffmpeg-wasm.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ CONF_FLAGS=(
3333
-sENVIRONMENT=worker
3434
-sWASM_BIGINT # enable big int support
3535
-sUSE_SDL=2 # use emscripten SDL2 lib port
36+
-sSTACK_SIZE=5MB # increase stack size to support libopus
3637
-sMODULARIZE # modularized to use as a library
3738
${FFMPEG_MT:+ -sINITIAL_MEMORY=1024MB} # ALLOW_MEMORY_GROWTH is not recommended when using threads, thus we use a large initial memory
3839
${FFMPEG_MT:+ -sPTHREAD_POOL_SIZE=32} # use 32 threads

packages/ffmpeg/src/classes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ export class FFmpeg {
194194
type: "module",
195195
}) :
196196
// We need to duplicated the code here to enable webpack
197-
// to bundle worekr.js here.
197+
// to bundle worker.js here.
198198
new Worker(new URL("./worker.js", import.meta.url), {
199199
type: "module",
200200
});

0 commit comments

Comments
 (0)