diff --git a/ffmpeg/build.sh b/ffmpeg/build.sh index cc037c1..ad14677 100644 --- a/ffmpeg/build.sh +++ b/ffmpeg/build.sh @@ -3,19 +3,36 @@ set -e # ANDROID_NDK_ROOT and ANDROID_SDK_ROOT need to be set (possibly to ~/Android/Sdk/ndk/##.#.#######/ and ~/Android/Sdk respectively) -ARCH=x86_64 -VERSION=v5.1.LTS +export ANDROID_NDK_ROOT=/usr/local/android-ndk +export ANDROID_SDK_ROOT=/usr/local/android-sdk + +VERSION=7.1.1 +OUT_DIRECTORY=ffmpeg-android-$VERSION-aarch64 + +if [ ! -d "ffmpeg-kit" ]; then + tar xf ffmpeg-kit.tar.xz +fi -git clone --depth 1 --branch $VERSION https://github.com/arthenica/ffmpeg-kit.git cd ffmpeg-kit -./android.sh --enable-x264 --enable-libvpx --enable-gpl --disable-arm-v7a{,-neon} --disable-arm64-v8a --disable-x86 --no-archive +./android.sh \ + --enable-gpl \ + --enable-x264 \ + --enable-libvpx \ + --enable-android-media-codec \ + --disable-arm-v7a-neon \ + --disable-arm-v7a \ + --disable-x86-64 \ + --disable-x86 \ + --no-archive cd .. -OUT_DIRECTORY=ffmpeg-android-$VERSION-$ARCH mkdir $OUT_DIRECTORY -cp -r ffmpeg-kit/prebuilt/android-x86_64/{ffmpeg,libvpx,x264}/* $OUT_DIRECTORY/ + cp $0 $OUT_DIRECTORY +cp -r ffmpeg-kit/prebuilt/android-arm64/{ffmpeg,libvpx,x264}/* $OUT_DIRECTORY/ +cp ffmpeg-kit/src/ffmpeg/config.h ffmpeg-kit/src/ffmpeg/libavcodec/codec_internal.h $OUT_DIRECTORY/include/libavcodec/ + tar c $OUT_DIRECTORY | xz -T0 > $OUT_DIRECTORY.tar.xz diff --git a/ffmpeg/ffmpeg-android-6.0.2-aarch64.tar.xz b/ffmpeg/ffmpeg-android-6.0.2-aarch64.tar.xz index 99f543b..50acffd 100644 Binary files a/ffmpeg/ffmpeg-android-6.0.2-aarch64.tar.xz and b/ffmpeg/ffmpeg-android-6.0.2-aarch64.tar.xz differ diff --git a/ffmpeg/ffmpeg-android-6.1.2-aarch64.tar.xz b/ffmpeg/ffmpeg-android-6.1.2-aarch64.tar.xz index c1546af..048bf1e 100644 Binary files a/ffmpeg/ffmpeg-android-6.1.2-aarch64.tar.xz and b/ffmpeg/ffmpeg-android-6.1.2-aarch64.tar.xz differ diff --git a/ffmpeg/ffmpeg-android-7.0.3-aarch64.tar.xz b/ffmpeg/ffmpeg-android-7.0.3-aarch64.tar.xz index 8070d80..6667024 100644 Binary files a/ffmpeg/ffmpeg-android-7.0.3-aarch64.tar.xz and b/ffmpeg/ffmpeg-android-7.0.3-aarch64.tar.xz differ diff --git a/ffmpeg/ffmpeg-android-7.1.1-aarch64.tar.xz b/ffmpeg/ffmpeg-android-7.1.1-aarch64.tar.xz index f5315a0..5f0a086 100644 Binary files a/ffmpeg/ffmpeg-android-7.1.1-aarch64.tar.xz and b/ffmpeg/ffmpeg-android-7.1.1-aarch64.tar.xz differ diff --git a/ffmpeg/ffmpeg-android-v4.4.LTS.tar.xz b/ffmpeg/ffmpeg-android-v4.4.LTS.tar.xz deleted file mode 100644 index d32748d..0000000 Binary files a/ffmpeg/ffmpeg-android-v4.4.LTS.tar.xz and /dev/null differ diff --git a/ffmpeg/ffmpeg-android-v5.1.LTS-aarch64.tar.xz b/ffmpeg/ffmpeg-android-v5.1.LTS-aarch64.tar.xz deleted file mode 100644 index 3bbb591..0000000 Binary files a/ffmpeg/ffmpeg-android-v5.1.LTS-aarch64.tar.xz and /dev/null differ diff --git a/ffmpeg/ffmpeg-android-v5.1.LTS-x86_64.tar.xz b/ffmpeg/ffmpeg-android-v5.1.LTS-x86_64.tar.xz deleted file mode 100644 index dbfac90..0000000 Binary files a/ffmpeg/ffmpeg-android-v5.1.LTS-x86_64.tar.xz and /dev/null differ diff --git a/ffmpeg/ffmpeg-android-v5.1.LTS.tar.xz b/ffmpeg/ffmpeg-android-v5.1.LTS.tar.xz deleted file mode 100644 index b2cccdd..0000000 Binary files a/ffmpeg/ffmpeg-android-v5.1.LTS.tar.xz and /dev/null differ