Merge branch 'master' into media-file

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.4**, but the version can be overridden.
+By default this script downloads and builds the FFmpeg **4.4.1**, 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/libaom/download.sh

@@ -2,7 +2,7 @@
 
 source ${SCRIPTS_DIR}/common-functions.sh
 
-AOM_VERSION=v3.1.2
+AOM_VERSION=v3.2.0
 
 downloadTarArchive \
   "libaom" \

scripts/libdav1d/build.sh

@@ -22,7 +22,7 @@ cpu_family = '${CPU_FAMILY}'
 cpu = '${TARGET_TRIPLE_MACHINE_ARCH}'
 endian = 'little'
 
-[paths]
+[built-in options]
 prefix = '${INSTALL_DIR}'
 EOF
 

scripts/libdav1d/download.sh

@@ -2,7 +2,7 @@
 
 source ${SCRIPTS_DIR}/common-functions.sh
 
-DAV1D_VERSION=0.9.0
+DAV1D_VERSION=0.9.2
 
 downloadTarArchive \
   "libdav1d" \

scripts/libfreetype/download.sh

@@ -2,7 +2,7 @@
 
 source ${SCRIPTS_DIR}/common-functions.sh
 
-FREETYPE_VERSION=2.10.2
+FREETYPE_VERSION=2.11.0
 
 downloadTarArchive \
   "libfreetype" \

scripts/libfribidi/download.sh

@@ -2,7 +2,7 @@
 
 source ${SCRIPTS_DIR}/common-functions.sh
 
-FRIBIDI_VERSION=1.0.10
+FRIBIDI_VERSION=1.0.11
 
 downloadTarArchive \
   "libfribidi" \

scripts/parse-arguments.sh

@@ -9,7 +9,7 @@
 ABIS_TO_BUILD=()
 API_LEVEL=19
 SOURCE_TYPE=TAR
-SOURCE_VALUE=4.4
+SOURCE_VALUE=4.4.1
 EXTERNAL_LIBRARIES=()
 FFMPEG_GPL_ENABLED=false