diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-24 15:13:03 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-24 15:24:28 +0400 |
| commit | fe40a9f98f599699b0989d8c8cb35cb24eb2e52f (patch) | |
| tree | f4ee45ae1a0762edc121ea98ce03d39557424fc7 /libavutil/cpu.h | |
| parent | a4d3757b29b5e9affd97cbc4e6fc2d202378610b (diff) | |
| parent | 2a6eaeaa85d17b27ee0dd449183ec197c35c9675 (diff) | |
Merge commit '2a6eaeaa85d17b27ee0dd449183ec197c35c9675'
* commit '2a6eaeaa85d17b27ee0dd449183ec197c35c9675':
Move get_logical_cpus() from lavc/pthread to lavu/cpu.
Conflicts:
doc/APIchanges
libavcodec/pthread.c
libavutil/cpu.c
libavutil/cpu.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/cpu.h')
| -rw-r--r-- | libavutil/cpu.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavutil/cpu.h b/libavutil/cpu.h index c8f34e0272..df8ef8728a 100644 --- a/libavutil/cpu.h +++ b/libavutil/cpu.h @@ -100,6 +100,11 @@ int av_parse_cpu_flags(const char *s); */ int av_parse_cpu_caps(unsigned *flags, const char *s); +/** + * @return the number of logical CPU cores present. + */ +int av_cpu_count(void); + /* The following CPU-specific functions shall not be called directly. */ int ff_get_cpu_flags_arm(void); int ff_get_cpu_flags_ppc(void); |