From c1bf56a526f94bcfd74da1f19c3f8a0f12fa787e Mon Sep 17 00:00:00 2001
From: Thilo Borgmann <thilo.borgmann@mail.de>
Date: Tue, 20 Jul 2021 09:33:47 +0200
Subject: [PATCH] lavu/cpu: Use av_cpu_ prefix
---
doc/APIchanges | 3 +++
fftools/cmdutils.c | 2 +-
libavutil/cpu.c | 3 ++-
libavutil/cpu.h | 2 +-
libavutil/version.h | 4 ++--
5 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/doc/APIchanges b/doc/APIchanges
index 91ded137f2b..308e2d50619 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -13,6 +13,9 @@ libavutil: 2021-04-27
API changes, most recent first:
+2021-07-19 - xxxxxxxxxx - lavu 57.1.100 - cpu.h
+ Add av_cpu_force_count()
+
2021-06-17 - xxxxxxxxxx - lavc 59.2.100 - packet.h
Add AV_PKT_DATA_DYNAMIC_HDR10_PLUS
diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c
index 6e875104fd8..18bcfb065ab 100644
--- a/fftools/cmdutils.c
+++ b/fftools/cmdutils.c
@@ -874,7 +874,7 @@ int opt_cpucount(void *optctx, const char *opt, const char *arg)
ret = av_opt_eval_int(&pclass, opts, arg, &count);
if (!ret) {
- av_force_cpu_count(count);
+ av_cpu_force_count(count);
}
return ret;
diff --git a/libavutil/cpu.c b/libavutil/cpu.c
index eae1485f36d..4627af4f230 100644
--- a/libavutil/cpu.c
+++ b/libavutil/cpu.c
@@ -236,7 +236,8 @@ int av_cpu_count(void)
return nb_cpus;
}
-void av_force_cpu_count(int count){
+void av_cpu_force_count(int count)
+{
atomic_store_explicit(&cpu_count, count, memory_order_relaxed);
}
diff --git a/libavutil/cpu.h b/libavutil/cpu.h
index c0690764394..afea0640b4e 100644
--- a/libavutil/cpu.h
+++ b/libavutil/cpu.h
@@ -102,7 +102,7 @@ int av_cpu_count(void);
* Overrides cpu count detection and forces the specified count.
* Count < 1 disables forcing of specific count.
*/
-void av_force_cpu_count(int count);
+void av_cpu_force_count(int count);
/**
* Get the maximum data alignment that may be required by FFmpeg.
diff --git a/libavutil/version.h b/libavutil/version.h
index 8312727aca9..34b83112dec 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -79,8 +79,8 @@
*/
#define LIBAVUTIL_VERSION_MAJOR 57
-#define LIBAVUTIL_VERSION_MINOR 0
-#define LIBAVUTIL_VERSION_MICRO 101
+#define LIBAVUTIL_VERSION_MINOR 1
+#define LIBAVUTIL_VERSION_MICRO 100
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
LIBAVUTIL_VERSION_MINOR, \
--
GitLab