[FFmpeg-cvslog] Merge commit '2a6eaeaa85d17b27ee0dd449183ec197c35c9675'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May 24 13:13:03 2013 +0200| [fe40a9f98f599699b0989d8c8cb35cb24eb2e52f] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fe40a9f98f599699b0989d8c8cb35cb24eb2e52f
---