rename to ffmpeg-all-codecs.js

WHQCHINA · Jun 10, 2014 · 9ea06f1 · 9ea06f1
1 parent 01b6dec
commit 9ea06f1
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 3 deletions.
diff --git a/build/build_all_codecs.sh b/build/build_all_codecs.sh
@@ -80,7 +80,7 @@ cp dist/lib/libx264.a dist/libx264.bc
 cp ffmpeg/ffmpeg dist/ffmpeg.bc
 
 cd dist
-emcc -s OUTLINING_LIMIT=100000 -s VERBOSE=1 -s TOTAL_MEMORY=33554432 -O2 -v ffmpeg.bc libx264.bc  libvpx.bc libz.bc -o ../ffmpeg_all.js --pre-js ../ffmpeg_pre.js --post-js ../ffmpeg_post.js
+emcc -s OUTLINING_LIMIT=100000 -s VERBOSE=1 -s TOTAL_MEMORY=33554432 -O2 -v ffmpeg.bc libx264.bc  libvpx.bc libz.bc -o ../ffmpeg_all_codecs.js --pre-js ../ffmpeg_pre.js --post-js ../ffmpeg_post.js
 cd ..
 
 

diff --git a/build/ffmpeg_all.js → build/ffmpeg-all-codecs.js b/build/ffmpeg_all.js → build/ffmpeg-all-codecs.js
diff --git a/build/ffmpeg_all.js.map b/build/ffmpeg_all.js.map
diff --git a/demo/worker-asm.js b/demo/worker-asm.js
@@ -1,4 +1,4 @@
-importScripts('../build/ffmpeg_all.js');
+importScripts('../build/ffmpeg-all-codecs.js');
 
 var now = Date.now;
-Original file line number
+Diff line change
@@ Expand Up / @@ -80,7 +80,7 @@ cp dist/lib/libx264.a dist/libx264.bc @@
     cp ffmpeg/ffmpeg dist/ffmpeg.bc
     cd dist
-    emcc -s OUTLINING_LIMIT=100000 -s VERBOSE=1 -s TOTAL_MEMORY=33554432 -O2 -v ffmpeg.bc libx264.bc  libvpx.bc libz.bc -o ../ffmpeg_all.js --pre-js ../ffmpeg_pre.js --post-js ../ffmpeg_post.js
+    emcc -s OUTLINING_LIMIT=100000 -s VERBOSE=1 -s TOTAL_MEMORY=33554432 -O2 -v ffmpeg.bc libx264.bc  libvpx.bc libz.bc -o ../ffmpeg_all_codecs.js --pre-js ../ffmpeg_pre.js --post-js ../ffmpeg_post.js
     cd ..
@@ Expand Down @@