Upgrade to FFmpeg 7.0

This commit is contained in:
Anton Liaposhchenko 2024-05-18 00:00:50 +03:00
parent e78b7956c7
commit fa95547dba
3 changed files with 3 additions and 3 deletions

View File

@ -20,6 +20,7 @@
#include <pthread.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <string.h>
#include "config.h"
#include "libavcodec/jni.h"

View File

@ -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"

View File

@ -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)