| Message ID | tencent_136357879CA8E1805AA635FF812C34693E09@qq.com |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel,v2,1/4] avutil/aarch64: Skip define AV_READ_TIME for apple | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
On Fri, 7 Jun 2024, Zhao Zhili wrote: > From: Zhao Zhili <zhilizhao@tencent.com> > > It will fallback to mach_absolute_time inside libavutil/timer.h > --- > libavutil/aarch64/timer.h | 8 +------- > 1 file changed, 1 insertion(+), 7 deletions(-) > > diff --git a/libavutil/aarch64/timer.h b/libavutil/aarch64/timer.h > index 8b28fd354c..fadc9568f8 100644 > --- a/libavutil/aarch64/timer.h > +++ b/libavutil/aarch64/timer.h > @@ -24,13 +24,7 @@ > #include <stdint.h> > #include "config.h" > > -#if defined(__APPLE__) > - > -#include <mach/mach_time.h> > - > -#define AV_READ_TIME mach_absolute_time > - > -#elif HAVE_INLINE_ASM > +#if HAVE_INLINE_ASM && !defined(__APPLE__) > > #define AV_READ_TIME read_time > > -- > 2.34.1 LGTM // Martin
diff --git a/libavutil/aarch64/timer.h b/libavutil/aarch64/timer.h index 8b28fd354c..fadc9568f8 100644 --- a/libavutil/aarch64/timer.h +++ b/libavutil/aarch64/timer.h @@ -24,13 +24,7 @@ #include <stdint.h> #include "config.h" -#if defined(__APPLE__) - -#include <mach/mach_time.h> - -#define AV_READ_TIME mach_absolute_time - -#elif HAVE_INLINE_ASM +#if HAVE_INLINE_ASM && !defined(__APPLE__) #define AV_READ_TIME read_time
From: Zhao Zhili <zhilizhao@tencent.com> It will fallback to mach_absolute_time inside libavutil/timer.h --- libavutil/aarch64/timer.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)