diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-24 13:13:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-24 13:24:28 +0200 |
| commit | fe40a9f98f599699b0989d8c8cb35cb24eb2e52f (patch) | |
| tree | f4ee45ae1a0762edc121ea98ce03d39557424fc7 /doc | |
| 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 'doc')
| -rw-r--r-- | doc/APIchanges | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 7d720258c3..1143d56d41 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -16,7 +16,10 @@ libavutil: 2012-10-22 API changes, most recent first: -2013-05-24 - xxxxxxx - lavc 55.7.0 - avcodec.h +2013-05-24 - xxxxxxx - lavu 52.34.100 - cpu.h + Add av_cpu_count() function for getting the number of logical CPUs. + +2013-05-24 - xxxxxxx - lavc 55.12.100 - avcodec.h Add picture_structure to AVCodecParserContext. 2013-05-17 - xxxxxxx - lavu 52.33.100 - opt.h |