From 3b891733fd6528d7f46286d9e7704453ea5a3e91 Mon Sep 17 00:00:00 2001 From: ownedbywuigi Date: Thu, 23 Apr 2026 06:23:06 +0100 Subject: [PATCH] Fix the damn conflict --- media/ffvpx/libavutil/timer.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/media/ffvpx/libavutil/timer.h b/media/ffvpx/libavutil/timer.h index b8c44f6eb2..95da52d060 100644 --- a/media/ffvpx/libavutil/timer.h +++ b/media/ffvpx/libavutil/timer.h @@ -26,22 +26,26 @@ #ifndef AVUTIL_TIMER_H #define AVUTIL_TIMER_H +#include #include "config.h" #if HAVE_INLINE_ASM +#if ARCH_LOONGARCH64 + #define AV_READ_TIME read_time static inline uint64_t read_time(void) { - -#if ARCH_LOONGARCH64 uint64_t a, id; __asm__ volatile ( "rdtime.d %0, %1" : "=r"(a), "=r"(id) :: ); return a; +} #else #define START_TIMER #define STOP_TIMER(id) { } #endif +#endif /* HAVE_INLINE_ASM */ + #endif /* AVUTIL_TIMER_H */