Skip to content
This repository was archived by the owner on Sep 5, 2024. It is now read-only.

Commit 68888c1

Browse files
committed
Enable libaom for av1 / avif
1 parent 2cd7b16 commit 68888c1

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ name: FFmpeg.wasm
33
# events but only for the master branch
44
on:
55
push:
6-
branches: [ n4.3.1-wasm ]
6+
branches: [ n4.3.1-wasm-next ]
77
pull_request:
8-
branches: [ n4.3.1-wasm ]
8+
branches: [ n4.3.1-wasm-next ]
99

1010
env:
1111
EM_VERSION: 2.0.8

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ $SCRIPT_ROOT/build-vorbis.sh
2929
# build theora
3030
$SCRIPT_ROOT/build-theora.sh
3131
# build aom (disabled as it is extremely slow)
32-
# $SCRIPT_ROOT/build-aom.sh
32+
$SCRIPT_ROOT/build-aom.sh
3333
# configure FFmpeg with Emscripten
3434
$SCRIPT_ROOT/configure-ffmpeg.sh
3535
# build ffmpeg.wasm core

wasm/build-scripts/build-ffmpeg.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ FLAGS=(
99
-I. -I./fftools -I$BUILD_DIR/include
1010
-Llibavcodec -Llibavdevice -Llibavfilter -Llibavformat -Llibavresample -Llibavutil -Llibpostproc -Llibswscale -Llibswresample -L$BUILD_DIR/lib
1111
-Wno-deprecated-declarations -Wno-pointer-sign -Wno-implicit-int-float-conversion -Wno-switch -Wno-parentheses -Qunused-arguments
12-
-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
12+
-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
1313
fftools/ffmpeg_opt.c fftools/ffmpeg_filter.c fftools/ffmpeg_hw.c fftools/cmdutils.c fftools/ffmpeg.c
1414
-o wasm/dist/ffmpeg-core.js
1515
-s USE_SDL=2 # use SDL2

wasm/build-scripts/configure-ffmpeg.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ FLAGS=(
1616
--enable-libfdk-aac # enable libfdk-aac
1717
--enable-libtheora # enable libtheora
1818
--enable-libvorbis # enable libvorbis
19-
# --enable-libaom # enable libaom
19+
--enable-libaom # enable libaom
2020
)
2121
echo "FFMPEG_CONFIG_FLAGS=${FLAGS[@]}"
2222
emconfigure ./configure "${FLAGS[@]}"

wasm/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

wasm/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ffmpeg/core",
3-
"version": "0.8.2",
3+
"version": "0.9.0-alpha.1",
44
"description": "ffmpeg.wasm core",
55
"main": "dist/ffmpeg-core.js",
66
"scripts": {

0 commit comments

Comments
 (0)