File tree Expand file tree Collapse file tree 3 files changed +12
-18
lines changed Expand file tree Collapse file tree 3 files changed +12
-18
lines changed Original file line number Diff line number Diff line change @@ -112,8 +112,6 @@ build/lame/dist/lib/libmp3lame.so:
112
112
113
113
build/x264/dist/lib/libx264.so :
114
114
cd build/x264 && \
115
- git reset --hard && \
116
- patch -p1 < ../x264-fix-configure.patch && \
117
115
emconfigure ./configure \
118
116
--prefix=" $$ (pwd)/dist" \
119
117
--extra-cflags=" -Wno-unknown-warning-option" \
@@ -244,9 +242,9 @@ ffmpeg-worker-webm.js: $(FFMPEG_WEBM_BC) $(PRE_JS) $(POST_JS_WORKER)
244
242
ffmpeg-mp4.js : $(FFMPEG_MP4_BC ) $(PRE_JS ) $(POST_JS_SYNC )
245
243
emcc $(FFMPEG_MP4_BC ) $(MP4_SHARED_DEPS ) \
246
244
--post-js $(POST_JS_SYNC ) \
247
- $(EMCC_COMMON_ARGS )
245
+ $(EMCC_COMMON_ARGS ) -O2
248
246
249
247
ffmpeg-worker-mp4.js : $(FFMPEG_MP4_BC ) $(PRE_JS ) $(POST_JS_WORKER )
250
248
emcc $(FFMPEG_MP4_BC ) $(MP4_SHARED_DEPS ) \
251
249
--post-js $(POST_JS_WORKER ) \
252
- $(EMCC_COMMON_ARGS )
250
+ $(EMCC_COMMON_ARGS ) -O2
Original file line number Diff line number Diff line change 1
1
function __ffmpegjs ( __ffmpegjs_opts ) {
2
2
__ffmpegjs_opts = __ffmpegjs_opts || { } ;
3
+ var __ffmpegjs_abort = abort ;
3
4
var __ffmpegjs_return ;
4
5
var Module = { } ;
5
6
@@ -22,6 +23,15 @@ function __ffmpegjs(__ffmpegjs_opts) {
22
23
}
23
24
} ) ;
24
25
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
+
25
35
// Fix CR.
26
36
function __ffmpegjs_out ( cb ) {
27
37
var buf = [ ] ;
@@ -49,7 +59,6 @@ function __ffmpegjs(__ffmpegjs_opts) {
49
59
Module [ "stdout" ] ( 0 , true ) ;
50
60
Module [ "stderr" ] ( 0 , true ) ;
51
61
if ( __ffmpegjs_opts [ "onExit" ] ) __ffmpegjs_opts [ "onExit" ] ( status ) ;
52
- throw new ExitStatus ( status ) ;
53
62
} ;
54
63
55
64
Module [ "preRun" ] = function ( ) {
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments