Merge branch 'master' into media-file

# Conflicts:
#	.github/workflows/compilability_check.yml

.github/workflows/compilability_check.yml

@@ -19,4 +19,4 @@ jobs:
         run: |
           export ANDROID_SDK_HOME=$ANDROID_HOME
           export ANDROID_NDK_HOME=$ANDROID_NDK_LATEST_HOME
-          ./ffmpeg-android-maker.sh -all-free -all-gpl -android=21 -abis=${{ matrix.abi }}
+          ./ffmpeg-android-maker.sh -dav1d -android=16 -abis=${{ matrix.abi }}

scripts/ffmpeg/build.sh

@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
 
 case $ANDROID_ABI in
+  armeabi-v7a)
+    EXTRA_BUILD_CONFIGURATION_FLAGS=--enable-thumb
+    ;;
   x86)
     # Disabling assembler optimizations, because they have text relocations
     EXTRA_BUILD_CONFIGURATION_FLAGS=--disable-asm
@@ -25,6 +28,9 @@ done
 DEP_CFLAGS="-I${BUILD_DIR_EXTERNAL}/${ANDROID_ABI}/include"
 DEP_LD_FLAGS="-L${BUILD_DIR_EXTERNAL}/${ANDROID_ABI}/lib $FFMPEG_EXTRA_LD_FLAGS"
 
+# Everything that goes below ${EXTRA_BUILD_CONFIGURATION_FLAGS} is my project-specific.
+# You are free to enable/disable whatever you actually need.
+
 ./configure \
   --prefix=${BUILD_DIR_FFMPEG}/${ANDROID_ABI} \
   --enable-cross-compile \
@@ -45,6 +51,22 @@ DEP_LD_FLAGS="-L${BUILD_DIR_EXTERNAL}/${ANDROID_ABI}/lib $FFMPEG_EXTRA_LD_FLAGS"
   --disable-static \
   --pkg-config=${PKG_CONFIG_EXECUTABLE} \
   ${EXTRA_BUILD_CONFIGURATION_FLAGS} \
+  --disable-runtime-cpudetect \
+  --disable-programs \
+  --disable-muxers \
+  --disable-encoders \
+  --disable-avdevice \
+  --disable-postproc \
+  --disable-swresample \
+  --disable-avfilter \
+  --disable-doc \
+  --disable-debug \
+  --disable-pthreads \
+  --disable-network \
+  --disable-bsfs \
+  --disable-protocols \
+  --enable-protocol=file \
+  --enable-protocol=pipe \
   $ADDITIONAL_COMPONENTS || exit 1
 
 ${MAKE_EXECUTABLE} clean

scripts/libaom/build.sh

@@ -12,6 +12,7 @@ ${CMAKE_EXECUTABLE} .. \
  -DCMAKE_TOOLCHAIN_FILE=${SCRIPTS_DIR}/libaom/android.cmake \
  -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} \
  -DCONFIG_PIC=1 \
+ -DCONFIG_AV1_ENCODER=0 \
  -DCONFIG_RUNTIME_CPU_DETECT=0 \
  -DENABLE_TESTS=0 \
  -DENABLE_DOCS=0 \