Am 19.07.21 um 23:51 schrieb James Almer: > On 7/19/2021 6:47 PM, Thilo Borgmann wrote: >> 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? > > You need to bump the library version when you add new API. Since you didn't > when you first added the function, you can do it now. > And of course, the version you report in doc/APIchanges should be the one > that introduced the new API.
Hopefully compliant patch attached. >> Also, is the commit hash meant be added in a separate commit later to >> doc/APIchanges? > > The hash is added later, once you know the hash of the commit you're pushing. > We usually add many in batches. Thanks, Thilo
From feda7cd8201632ee89e4473abbe7a68646c48dd9 Mon Sep 17 00:00:00 2001 From: Thilo Borgmann <thilo.borgm...@mail.de> Date: Mon, 19 Jul 2021 23:58:01 +0200 Subject: [PATCH] lavu/cpu: Use av_cpu_ prefix --- doc/APIchanges | 3 +++ fftools/cmdutils.c | 2 +- libavutil/cpu.c | 2 +- libavutil/cpu.h | 2 +- libavutil/version.h | 4 ++-- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 91ded137f2..308e2d5061 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 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. diff --git a/libavutil/version.h b/libavutil/version.h index 8312727aca..34b83112de 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, \ -- 2.20.1 (Apple Git-117)
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".