Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
* [FFmpeg-devel] [PR] arm/timer: disable PMCCNTR timer for Android (PR #21460)
@ 2026-01-14  8:23 Zhao Zhili via ffmpeg-devel
  0 siblings, 0 replies; only message in thread
From: Zhao Zhili via ffmpeg-devel @ 2026-01-14  8:23 UTC (permalink / raw)
  To: ffmpeg-devel; +Cc: Zhao Zhili

PR #21460 opened by Zhao Zhili (quink)
URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21460
Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21460.patch

Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>


>From 5711017b6b42bd507a7e221ce7a5e9ace603db42 Mon Sep 17 00:00:00 2001
From: Zhao Zhili <zhilizhao@tencent.com>
Date: Wed, 14 Jan 2026 16:01:52 +0800
Subject: [PATCH] arm/timer: disable PMCCNTR timer for Android

Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
---
 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
 
-- 
2.49.1

_______________________________________________
ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org
To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2026-01-14  8:23 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-01-14  8:23 [FFmpeg-devel] [PR] arm/timer: disable PMCCNTR timer for Android (PR #21460) Zhao Zhili via ffmpeg-devel

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git