* commit '2a6eaeaa':
  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>