diff options
| author | Thilo Borgmann <thilo.borgmann@mail.de> | 2021-07-20 09:33:47 +0200 |
|---|---|---|
| committer | Thilo Borgmann <thilo.borgmann@mail.de> | 2021-07-20 10:31:41 +0200 |
| commit | c1bf56a526f94bcfd74da1f19c3f8a0f12fa787e (patch) | |
| tree | 473dc2bc8514bf606e7a45ea0dd37b52e378fe77 /libavutil | |
| parent | cd7043131f4e2ecf9e5a88c53d3f1a67e2402928 (diff) | |
lavu/cpu: Use av_cpu_ prefix
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/cpu.c | 3 | ||||
| -rw-r--r-- | libavutil/cpu.h | 2 | ||||
| -rw-r--r-- | libavutil/version.h | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/libavutil/cpu.c b/libavutil/cpu.c index eae1485f36..4627af4f23 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 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, \ |