The branch, master has been updated
via 7a1c737c359509f59c8552e79b2fa6a191d61ad9 (commit)
from 6891314db18c96afa35f5e3765d60f4e257fc665 (commit)
- Log -----------------------------------------------------------------
commit 7a1c737c359509f59c8552e79b2fa6a191d61ad9
Author: caifan3 <[email protected]>
AuthorDate: Thu Sep 4 17:31:38 2025 +0800
Commit: Zhao Zhili <[email protected]>
CommitDate: Fri Sep 5 17:21:30 2025 +0000
libavcodec/v4l2_buffers: avoid redefinition of USEC_PER_SEC macro
The macro USEC_PER_SEC is already defined in system headers on some
platforms,such as Nuttx nuttx/clock.h.
Check if it's already defined before defining it to avoid compiler warnings.
Signed-off-by: caifan3 <[email protected]>
diff --git a/libavcodec/v4l2_buffers.c b/libavcodec/v4l2_buffers.c
index 7f597a424a..d869ce9e77 100644
--- a/libavcodec/v4l2_buffers.c
+++ b/libavcodec/v4l2_buffers.c
@@ -34,7 +34,10 @@
#include "v4l2_buffers.h"
#include "v4l2_m2m.h"
+#ifndef USEC_PER_SEC
#define USEC_PER_SEC 1000000
+#endif
+
static AVRational v4l2_timebase = { 1, USEC_PER_SEC };
static inline V4L2m2mContext *buf_to_m2mctx(V4L2Buffer *buf)
-----------------------------------------------------------------------
Summary of changes:
libavcodec/v4l2_buffers.c | 3 +++
1 file changed, 3 insertions(+)
hooks/post-receive
--
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
