Enable libaom for av1 / avif

.github/workflows/main.yml

@@ -3,9 +3,9 @@ name: FFmpeg.wasm
 # events but only for the master branch
 on:
   push:
-    branches: [ n4.3.1-wasm ]
+    branches: [ n4.3.1-wasm-next ]
   pull_request:
-    branches: [ n4.3.1-wasm ]
+    branches: [ n4.3.1-wasm-next ]
 
 env:
   EM_VERSION: 2.0.8

build.sh

@@ -29,7 +29,7 @@ $SCRIPT_ROOT/build-vorbis.sh
 # build theora
 $SCRIPT_ROOT/build-theora.sh
 # build aom (disabled as it is extremely slow)
-# $SCRIPT_ROOT/build-aom.sh
+$SCRIPT_ROOT/build-aom.sh
 # configure FFmpeg with Emscripten
 $SCRIPT_ROOT/configure-ffmpeg.sh
 # build ffmpeg.wasm core

wasm/build-scripts/build-ffmpeg.sh

@@ -9,7 +9,7 @@ FLAGS=(
   -I. -I./fftools -I$BUILD_DIR/include
   -Llibavcodec -Llibavdevice -Llibavfilter -Llibavformat -Llibavresample -Llibavutil -Llibpostproc -Llibswscale -Llibswresample -L$BUILD_DIR/lib
   -Wno-deprecated-declarations -Wno-pointer-sign -Wno-implicit-int-float-conversion -Wno-switch -Wno-parentheses -Qunused-arguments
-  -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
+  -lavdevice -lavfilter -lavformat -lavcodec -lswresample -lswscale -lavutil -lpostproc -lm -lx264 -lx265 -lvpx -lwavpack -lmp3lame -lfdk-aac -lvorbis -lvorbisenc -lvorbisfile -logg -ltheora -ltheoraenc -ltheoradec -lz -laom -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
   -s USE_SDL=2                                  # use SDL2

wasm/build-scripts/configure-ffmpeg.sh

@@ -16,7 +16,7 @@ FLAGS=(
   --enable-libfdk-aac     # enable libfdk-aac
   --enable-libtheora      # enable libtheora
   --enable-libvorbis      # enable libvorbis
-  # --enable-libaom         # enable libaom
+  --enable-libaom         # enable libaom
 )
 echo "FFMPEG_CONFIG_FLAGS=${FLAGS[@]}"
 emconfigure ./configure "${FLAGS[@]}"

wasm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ffmpeg/core",
-  "version": "0.8.2",
+  "version": "0.9.0-alpha.1",
   "description": "ffmpeg.wasm core",
   "main": "dist/ffmpeg-core.js",
   "scripts": {