eden-emu/FFmpeg
20
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge commit '2a6eaeaa85'

Browse source 
* commit '2a6eaeaa85':
  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
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