From e3b3842132f6b0f6e4e755a0487a293de128bb85 Mon Sep 17 00:00:00 2001 From: Jerome Wu Date: Tue, 3 Nov 2020 17:34:33 +0800 Subject: [PATCH] Revert prepend --- wasm/build-scripts/build-ffmpeg.sh | 1 - wasm/src/prepend.js | 8 -------- 2 files changed, 9 deletions(-) delete mode 100644 wasm/src/prepend.js diff --git a/wasm/build-scripts/build-ffmpeg.sh b/wasm/build-scripts/build-ffmpeg.sh index c5e5764bcef39..714a34120afe6 100755 --- a/wasm/build-scripts/build-ffmpeg.sh +++ b/wasm/build-scripts/build-ffmpeg.sh @@ -12,7 +12,6 @@ FLAGS=( -lavdevice -lavfilter -lavformat -lavcodec -lswresample -lswscale -lavutil -lpostproc -lm -lx264 -lx265 -lvpx -lwavpack -lmp3lame -lfdk-aac -lvorbis -lvorbisenc -lvorbisfile -logg -ltheora -ltheoraenc -ltheoradec -lz -pthread fftools/ffmpeg_opt.c fftools/ffmpeg_filter.c fftools/ffmpeg_hw.c fftools/cmdutils.c fftools/ffmpeg.c -o wasm/dist/ffmpeg-core.js - --pre-js wasm/src/prepend.js # fix worker script issue -s USE_SDL=2 # use SDL2 -s USE_PTHREADS=1 # enable pthreads support -s PROXY_TO_PTHREAD=1 # detach main() from browser/UI main thread diff --git a/wasm/src/prepend.js b/wasm/src/prepend.js deleted file mode 100644 index 2b2d5c10a2bd1..0000000000000 --- a/wasm/src/prepend.js +++ /dev/null @@ -1,8 +0,0 @@ -Module['locateFile'] = function(path, prefix) { - if (typeof window !== 'undefined' - && typeof window.FFMPEG_CORE_WORKER_SCRIPT !== 'undefined' - && path.endsWith('ffmpeg-core.worker.js')) { - return window.FFMPEG_CORE_WORKER_SCRIPT; - } - return prefix + path; -}