Skip to content

Commit ea20e25

Browse files
author
xufuji456
committed
update: FFmpeg-6.0 include headers
1 parent eec03a7 commit ea20e25

74 files changed

Lines changed: 6776 additions & 7038 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app/src/main/cpp/include/arm64-v8a/libavutil/arm/timer.h‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,13 @@
2424
#include <stdint.h>
2525
#include "ffmpeg/config.h"
2626

27-
#if HAVE_INLINE_ASM
27+
#if defined(__APPLE__)
28+
29+
#include <mach/mach_time.h>
30+
31+
#define AV_READ_TIME mach_absolute_time
32+
33+
#elif HAVE_INLINE_ASM
2834

2935
#define AV_READ_TIME read_time
3036

‎app/src/main/cpp/include/armeabi-v7a/libavcodec/arm/mathops.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#define AVCODEC_ARM_MATHOPS_H
2424

2525
#include <stdint.h>
26-
#include "ffmpeg/config.h"
26+
#include "config.h"
2727
#include "libavutil/common.h"
2828

2929
#if HAVE_INLINE_ASM

‎app/src/main/cpp/include/armeabi-v7a/libavutil/arm/timer.h‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,13 @@
2424
#include <stdint.h>
2525
#include "ffmpeg/config.h"
2626

27-
#if HAVE_INLINE_ASM && defined(__ARM_ARCH_7A__)
27+
#if defined(__APPLE__)
28+
29+
#include <mach/mach_time.h>
30+
31+
#define AV_READ_TIME mach_absolute_time
32+
33+
#elif HAVE_INLINE_ASM && defined(__ARM_ARCH_7A__)
2834

2935
#define AV_READ_TIME read_time
3036

0 commit comments

Comments
 (0)