From 68888c10d76f0f217ededb5c3dcd2ec943ee497d Mon Sep 17 00:00:00 2001
From: Jerome Wu <jeromewus@gmail.com>
Date: Sat, 7 Nov 2020 14:03:38 +0800
Subject: [PATCH] Enable libaom for av1 / avif

---
 .github/workflows/main.yml             | 4 ++--
 build.sh                               | 2 +-
 wasm/build-scripts/build-ffmpeg.sh     | 2 +-
 wasm/build-scripts/configure-ffmpeg.sh | 2 +-
 wasm/package-lock.json                 | 2 +-
 wasm/package.json                      | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c749e9bcd57f4..21ade1bf52e0f 100644
--- a/.github/workflows/main.yml
+++ b/.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
diff --git a/build.sh b/build.sh
index f3afe399c8308..bddb0b10d23d4 100755
--- a/build.sh
+++ b/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
diff --git a/wasm/build-scripts/build-ffmpeg.sh b/wasm/build-scripts/build-ffmpeg.sh
index 714a34120afe6..fa8e32ad3f89e 100755
--- a/wasm/build-scripts/build-ffmpeg.sh
+++ b/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
diff --git a/wasm/build-scripts/configure-ffmpeg.sh b/wasm/build-scripts/configure-ffmpeg.sh
index 455a74bde06da..c023d11806d92 100755
--- a/wasm/build-scripts/configure-ffmpeg.sh
+++ b/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[@]}"
diff --git a/wasm/package-lock.json b/wasm/package-lock.json
index 457f57f02ed49..15edc78950696 100644
--- a/wasm/package-lock.json
+++ b/wasm/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@ffmpeg/core",
-  "version": "0.8.2",
+  "version": "0.9.0-alpha.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/wasm/package.json b/wasm/package.json
index 067e17a32de92..5bae741361741 100644
--- a/wasm/package.json
+++ b/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": {