Enable JPEG/PNG/ZLIB

Should be often needed.

Fixes #47

Makefile

@@ -7,8 +7,8 @@ POST_JS_SYNC = build/post-sync.js
 POST_JS_WORKER = build/post-worker.js
 
 COMMON_FILTERS = aresample scale crop overlay hstack vstack
-COMMON_DEMUXERS = matroska ogg mov mp3 wav concat
-COMMON_DECODERS = vp8 h264 vorbis opus mp3 aac pcm_s16le
+COMMON_DEMUXERS = matroska ogg mov mp3 wav image2 concat
+COMMON_DECODERS = vp8 h264 vorbis opus mp3 aac pcm_s16le mjpeg png
 
 WEBM_MUXERS = webm ogg null
 WEBM_ENCODERS = libvpx_vp8 libopus
@@ -183,7 +183,7 @@ FFMPEG_COMMON_ARGS = \
 	--disable-sdl2 \
 	--disable-securetransport \
 	--disable-xlib \
-	--disable-zlib
+	--enable-zlib
 
 build/ffmpeg-webm/ffmpeg.bc: $(WEBM_SHARED_DEPS)
 	cd build/ffmpeg-webm && \
@@ -193,7 +193,7 @@ build/ffmpeg-webm/ffmpeg.bc: $(WEBM_SHARED_DEPS)
 		$(addprefix --enable-muxer=,$(WEBM_MUXERS)) \
 		--enable-libopus \
 		--enable-libvpx \
-		--extra-cflags="-I../libvpx/dist/include" \
+		--extra-cflags="-s USE_ZLIB=1 -I../libvpx/dist/include" \
 		--extra-ldflags="-L../libvpx/dist/lib" \
 		&& \
 	emmake make -j && \
@@ -208,7 +208,7 @@ build/ffmpeg-mp4/ffmpeg.bc: $(MP4_SHARED_DEPS)
 		--enable-gpl \
 		--enable-libmp3lame \
 		--enable-libx264 \
-		--extra-cflags="-I../lame/dist/include" \
+		--extra-cflags="-s USE_ZLIB=1 -I../lame/dist/include" \
 		--extra-ldflags="-L../lame/dist/lib" \
 		&& \
 	emmake make -j && \

test/test.js

@@ -252,7 +252,7 @@ describe("WebM", function() {
       expect(file.data).to.be.an.instanceof(Uint8Array);
     });
 
-    /*it("should encode sequence of frames to WebM", function() {
+    it("should encode JPEGs to WebM", function() {
       var res = ffmpeg_webm({
         // FIXME(Kagami): pattern_type=sequence doesn't work with NODEFS
         // for some reason.
@@ -269,7 +269,23 @@ describe("WebM", function() {
       var file = res.MEMFS[0];
       expect(file.name).to.equal("out.webm");
       expect(file.data.length).to.be.above(0);
-    });*/
+    });
+
+    it("should encode PNGs to WebM", function() {
+      var res = ffmpeg_webm({
+        arguments: [
+          "-pattern_type", "glob",
+          "-i", "/data/test-frame*.png",
+          "out.webm",
+        ],
+        print: noop,
+        printErr: noop,
+        mounts: [{type: "NODEFS", opts: {root: "test"}, mountpoint: "/data"}],
+      });
+      var file = res.MEMFS[0];
+      expect(file.name).to.equal("out.webm");
+      expect(file.data.length).to.be.above(0);
+    });
   });
 
   describe("Worker", function() {