generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '2a6eaeaa85d17b27ee0dd449183ec197c35c9675'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2013-05-24 13:13:03 +02:00
parent a4d3757b29 2a6eaeaa85
commit fe40a9f98f
5 changed files with 69 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
doc/APIchanges
View File

@@ -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