lavu/cpu: Use av_cpu_ prefix

Thilo Borgmann committed 5 years ago

Commit c1bf56a1 parent cd704315 files · +9 −5Browse files

Unified · Split

5 files

doc/APIchanges +3 −0
fftools/cmdutils.c +1 −1
libavutil/cpu.c +2 −1
libavutil/cpu.h +1 −1
libavutil/version.h +2 −2

doc/APIchanges+3−0

@@ -13,6 +13,9 @@ libavutil: 2021-04-27 · 12 unmodified lines
13		13
14		14
15	API changes, most recent first:	15	API changes, most recent first:
		16	2021-07-19 - xxxxxxxxxx - lavu 57.1.100 - cpu.h
		17	Add av_cpu_force_count()
		18
16	2021-06-17 - xxxxxxxxxx - lavc 59.2.100 - packet.h	19	2021-06-17 - xxxxxxxxxx - lavc 59.2.100 - packet.h
17	Add AV_PKT_DATA_DYNAMIC_HDR10_PLUS	20	Add AV_PKT_DATA_DYNAMIC_HDR10_PLUS
18		21

fftools/cmdutils.c+1−1

@@ -874,7 +874,7 @@ int opt_cpucount(void optctx, const char opt, const char *arg) · 873 unmodified lines
874	ret = av_opt_eval_int(&pclass, opts, arg, &count);	874	ret = av_opt_eval_int(&pclass, opts, arg, &count);
875		875
876	if (!ret) {	876	if (!ret) {
877	av_force_cpu_count(count);	877	av_cpu_force_count(count);
878	}	878	}
879		879
880	return ret;	880	return ret;

libavutil/cpu.c+2−1

@@ -236,7 +236,8 @@ int av_cpu_count(void) · 235 unmodified lines
236	return nb_cpus;	236	return nb_cpus;
237	}	237	}
238		238
239	void av_force_cpu_count(int count){	239	void av_cpu_force_count(int count)
		240	{
240	atomic_store_explicit(&cpu_count, count, memory_order_relaxed);	241	atomic_store_explicit(&cpu_count, count, memory_order_relaxed);
241	}	242	}
242		243

libavutil/cpu.h+1−1

@@ -102,7 +102,7 @@ int av_cpu_count(void); · 101 unmodified lines
102	* Overrides cpu count detection and forces the specified count.	102	* Overrides cpu count detection and forces the specified count.
103	* Count < 1 disables forcing of specific count.	103	* Count < 1 disables forcing of specific count.
104	*/	104	*/
105	void av_force_cpu_count(int count);	105	void av_cpu_force_count(int count);
106		106
107	/**	107	/**
108	* Get the maximum data alignment that may be required by FFmpeg.	108	* Get the maximum data alignment that may be required by FFmpeg.

libavutil/version.h+2−2

@@ -79,8 +79,8 @@ · 78 unmodified lines
79	*/	79	*/
80		80
81	#define LIBAVUTIL_VERSION_MAJOR 57	81	#define LIBAVUTIL_VERSION_MAJOR 57
82	#define LIBAVUTIL_VERSION_MINOR 0	82	#define LIBAVUTIL_VERSION_MINOR 1
83	#define LIBAVUTIL_VERSION_MICRO 101	83	#define LIBAVUTIL_VERSION_MICRO 100
84		84
85	#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \	85	#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
86	LIBAVUTIL_VERSION_MINOR, \	86	LIBAVUTIL_VERSION_MINOR, \