Skip to content

Commit 1eef77e

Browse files
committed
Revert "fastcomp"
This reverts commit 7328839.
1 parent 0a2bf3f commit 1eef77e

File tree

3 files changed

+12
-18
lines changed

3 files changed

+12
-18
lines changed

Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,6 @@ build/lame/dist/lib/libmp3lame.so:
112112

113113
build/x264/dist/lib/libx264.so:
114114
cd build/x264 && \
115-
git reset --hard && \
116-
patch -p1 < ../x264-fix-configure.patch && \
117115
emconfigure ./configure \
118116
--prefix="$$(pwd)/dist" \
119117
--extra-cflags="-Wno-unknown-warning-option" \
@@ -244,9 +242,9 @@ ffmpeg-worker-webm.js: $(FFMPEG_WEBM_BC) $(PRE_JS) $(POST_JS_WORKER)
244242
ffmpeg-mp4.js: $(FFMPEG_MP4_BC) $(PRE_JS) $(POST_JS_SYNC)
245243
emcc $(FFMPEG_MP4_BC) $(MP4_SHARED_DEPS) \
246244
--post-js $(POST_JS_SYNC) \
247-
$(EMCC_COMMON_ARGS)
245+
$(EMCC_COMMON_ARGS) -O2
248246

249247
ffmpeg-worker-mp4.js: $(FFMPEG_MP4_BC) $(PRE_JS) $(POST_JS_WORKER)
250248
emcc $(FFMPEG_MP4_BC) $(MP4_SHARED_DEPS) \
251249
--post-js $(POST_JS_WORKER) \
252-
$(EMCC_COMMON_ARGS)
250+
$(EMCC_COMMON_ARGS) -O2

build/pre.js

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
function __ffmpegjs(__ffmpegjs_opts) {
22
__ffmpegjs_opts = __ffmpegjs_opts || {};
3+
var __ffmpegjs_abort = abort;
34
var __ffmpegjs_return;
45
var Module = {};
56

@@ -22,6 +23,15 @@ function __ffmpegjs(__ffmpegjs_opts) {
2223
}
2324
});
2425

26+
// Mute exception on unreachable.
27+
abort = function(what) {
28+
if (arguments.length) {
29+
__ffmpegjs_abort(what);
30+
} else {
31+
throw new ExitStatus(0);
32+
}
33+
};
34+
2535
// Fix CR.
2636
function __ffmpegjs_out(cb) {
2737
var buf = [];
@@ -49,7 +59,6 @@ function __ffmpegjs(__ffmpegjs_opts) {
4959
Module["stdout"](0, true);
5060
Module["stderr"](0, true);
5161
if (__ffmpegjs_opts["onExit"]) __ffmpegjs_opts["onExit"](status);
52-
throw new ExitStatus(status);
5362
};
5463

5564
Module["preRun"] = function() {

build/x264-fix-configure.patch

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)