From 6a251e8a6ffb758ba02bfe7e70ae0aa76c419376 Mon Sep 17 00:00:00 2001 From: Javernaut Date: Thu, 18 Jun 2020 13:17:04 +0300 Subject: [PATCH] Using FFmpeg 4.3 by default --- .travis.yml | 2 +- README.md | 2 +- scripts/parse-arguments.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4e6ba46..e75cf86 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,4 +17,4 @@ install: - curl http://archive.ubuntu.com/ubuntu/pool/universe/n/nasm/nasm_2.14.02-1_amd64.deb --output $HOME/nasm_2.14.02-1_amd64.deb - sudo dpkg -i $HOME/nasm_2.14.02-1_amd64.deb script: - - ./ffmpeg-android-maker.sh --source-git-branch=release/4.3 -dav1d -mp3lame -aom -opus -wavpack -twolame -speex -android=18 + - ./ffmpeg-android-maker.sh -dav1d -mp3lame -aom -opus -wavpack -twolame -speex -android=18 diff --git a/README.md b/README.md index 944ad67..fbc38da 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ The script also produces `ffmpeg` and `ffprobe` executables that can be used in The main focus of ffmpeg-android-maker is to prepare shared libraries for seamless integration into an Android project. The script prepares the `output` directory that is meant to be used. And it's not the only thing this project does. -By default this script downloads and builds the FFmpeg **4.2.3**, but the version can be overridden. +By default this script downloads and builds the FFmpeg **4.3**, but the version can be overridden. The details of how this script is implemented are described in this series of posts: * [Part 1](https://proandroiddev.com/a-story-about-ffmpeg-in-android-part-i-compilation-898e4a249422) diff --git a/scripts/parse-arguments.sh b/scripts/parse-arguments.sh index fd0d75e..528c769 100755 --- a/scripts/parse-arguments.sh +++ b/scripts/parse-arguments.sh @@ -9,7 +9,7 @@ ABIS_TO_BUILD=() API_LEVEL=16 SOURCE_TYPE=TAR -SOURCE_VALUE=4.2.3 +SOURCE_VALUE=4.3 BINUTILS=gnu EXTERNAL_LIBRARIES=()