Merge branch 'development' into what-the-codec

.travis.yml

@@ -3,13 +3,13 @@ jdk: openjdk8
 dist: xenial
 install:
   # Installing Android SDK
-  - curl https://dl.google.com/android/repository/commandlinetools-linux-6200805_latest.zip --output $HOME/android-sdk.zip
+  - curl https://dl.google.com/android/repository/commandlinetools-linux-6514223_latest.zip --output $HOME/android-sdk.zip
   - unzip -qq $HOME/android-sdk.zip -d $HOME/android-sdk
   - export ANDROID_SDK_HOME=$HOME/android-sdk
-  - export ANDROID_NDK_HOME=$ANDROID_SDK_HOME/ndk/21.1.6352462
+  - export ANDROID_NDK_HOME=$ANDROID_SDK_HOME/ndk/21.3.6528147
   # Installing necessary components of Android SDK
   - function installAndroidComponent() { yes | ${ANDROID_SDK_HOME}/tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_HOME} $1 > /dev/null; }
-  - installAndroidComponent "ndk;21.1.6352462"
+  - installAndroidComponent "ndk;21.3.6528147"
   - installAndroidComponent "cmake;3.10.2.4988404"
   # Installing meson, ninja and nasm that are necessary for libdav1d building
   - sudo apt-get install python3-pip python3-setuptools python3-wheel ninja-build

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)

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=()
 

tools/docker/Dockerfile

@@ -2,8 +2,8 @@ FROM ubuntu:20.04
 
 # Arguments that can be overridden in 'docker build' command:
 # Versions of Android SDK and NDK. The CMake is installed via NDK.
-ARG VERSION_SDK=6200805
-ARG VERSION_NDK=21.0.6113669
+ARG VERSION_SDK=6514223
+ARG VERSION_NDK=21.3.6528147
 ARG VERSION_CMAKE=3.10.2.4988404
 
 # Packages to install via apt-get