This is an automated email from the git hooks/post-receive script.
Git pushed a commit to branch master
in repository ffmpeg.
The following commit(s) were added to refs/heads/master by this push:
new e8daa03fee arm/timer: disable PMCCNTR timer for Android
e8daa03fee is described below
commit e8daa03feeff4aabe5cd67286045f48b4e4acfa7
Author: Zhao Zhili <[email protected]>
AuthorDate: Wed Jan 14 16:01:52 2026 +0800
Commit: Zhao Zhili <[email protected]>
CommitDate: Thu Jan 15 16:06:13 2026 +0000
arm/timer: disable PMCCNTR timer for Android
Signed-off-by: Zhao Zhili <[email protected]>
---
libavutil/arm/timer.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavutil/arm/timer.h b/libavutil/arm/timer.h
index caf23e2a5a..08e4095d84 100644
--- a/libavutil/arm/timer.h
+++ b/libavutil/arm/timer.h
@@ -30,7 +30,7 @@
#define AV_READ_TIME mach_absolute_time
-#elif HAVE_INLINE_ASM && defined(__ARM_ARCH_7A__)
+#elif HAVE_INLINE_ASM && defined(__ARM_ARCH_7A__) && !defined(__ANDROID__)
#define AV_READ_TIME read_time
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
