[FFmpeg-devel] [PATCH] lavu/cpu: Use av_cpu_ prefix

[Thilo Borgmann]

Am 19.07.21 um 23:20 schrieb James Almer:
> On 7/19/2021 6:19 PM, Andreas Rheinhardt wrote:
>> Thilo Borgmann:
>>> Hi,
>>>
>>> $subject for the new force cpu count function.
>>>
>>> Thanks,
>>> Thilo
>>>
>>
>> I just wanted to complain that you did not modify APIchanges as well;
>> but then I noticed that there is no entry there for this new function.
>> But there should be.
> 
> No version bump either, so this patch should definitely do both things.

Ok, does the attached look better?

Also, is the commit hash meant be added in a separate commit later to doc/APIchanges?

Thanks!
-Thilo
-------------- next part --------------
From 6a7752acdc3c9c735ce35b3a80076d8463c4de1a Mon Sep 17 00:00:00 2001
From: Thilo Borgmann <thilo.borgmann at mail.de>
Date: Mon, 19 Jul 2021 23:44:50 +0200
Subject: [PATCH] lavu/cpu: Use av_cpu_ prefix

---
 doc/APIchanges     | 3 +++
 fftools/cmdutils.c | 2 +-
 libavutil/cpu.c    | 2 +-
 libavutil/cpu.h    | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/doc/APIchanges b/doc/APIchanges
index 91ded137f2..ecbb0a2ddf 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.0.101 - 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 6e875104fd..18bcfb065a 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 eae1485f36..2c40d40239 100644
--- a/libavutil/cpu.c
+++ b/libavutil/cpu.c
@@ -236,7 +236,7 @@ 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 c069076439..afea0640b4 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.
-- 
2.20.1 (Apple Git-117)