From fa95547dbad1a041c81e213a7b7a610cc6d53274 Mon Sep 17 00:00:00 2001 From: Anton Date: Sat, 18 May 2024 00:00:50 +0300 Subject: [PATCH] Upgrade to FFmpeg 7.0 --- android/ffmpeg-kit-android-lib/src/main/cpp/ffprobekit.c | 1 + scripts/android/ffmpeg.sh | 1 - scripts/source.sh | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/ffmpeg-kit-android-lib/src/main/cpp/ffprobekit.c b/android/ffmpeg-kit-android-lib/src/main/cpp/ffprobekit.c index 089cefe..d627abf 100644 --- a/android/ffmpeg-kit-android-lib/src/main/cpp/ffprobekit.c +++ b/android/ffmpeg-kit-android-lib/src/main/cpp/ffprobekit.c @@ -20,6 +20,7 @@ #include #include #include +#include #include "config.h" #include "libavcodec/jni.h" diff --git a/scripts/android/ffmpeg.sh b/scripts/android/ffmpeg.sh index 8b311fd..23ded93 100755 --- a/scripts/android/ffmpeg.sh +++ b/scripts/android/ffmpeg.sh @@ -533,7 +533,6 @@ overwrite_file "${BASEDIR}"/src/ffmpeg/libavutil/x86/asm.h "${FFMPEG_LIBRARY_PAT overwrite_file "${BASEDIR}"/src/ffmpeg/libavutil/x86/timer.h "${FFMPEG_LIBRARY_PATH}"/include/libavutil/x86/timer.h 1>>"${BASEDIR}"/build.log 2>&1 overwrite_file "${BASEDIR}"/src/ffmpeg/libavutil/arm/timer.h "${FFMPEG_LIBRARY_PATH}"/include/libavutil/arm/timer.h 1>>"${BASEDIR}"/build.log 2>&1 overwrite_file "${BASEDIR}"/src/ffmpeg/libavutil/aarch64/timer.h "${FFMPEG_LIBRARY_PATH}"/include/libavutil/aarch64/timer.h 1>>"${BASEDIR}"/build.log 2>&1 -overwrite_file "${BASEDIR}"/src/ffmpeg/libavutil/x86/emms.h "${FFMPEG_LIBRARY_PATH}"/include/libavutil/x86/emms.h 1>>"${BASEDIR}"/build.log 2>&1 if [ $? -eq 0 ]; then echo "ok" diff --git a/scripts/source.sh b/scripts/source.sh index 5aa71f0..5ae08ad 100755 --- a/scripts/source.sh +++ b/scripts/source.sh @@ -32,8 +32,8 @@ get_library_source() { SOURCE_TYPE="TAG" ;; ffmpeg) - SOURCE_REPO_URL="https://github.com/arthenica/FFmpeg" - SOURCE_ID="n6.0" + SOURCE_REPO_URL="https://github.com/FFmpeg/FFmpeg" + SOURCE_ID="n7.0" SOURCE_TYPE="TAG" ;; fontconfig)