Merge commit '2a6eaeaa85d17b27ee0dd449183ec197c35c9675'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 24 May 2013 11:13:03 +0000 (13:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 24 May 2013 11:24:28 +0000 (13:24 +0200)
commitfe40a9f98f599699b0989d8c8cb35cb24eb2e52f
treef4ee45ae1a0762edc121ea98ce03d39557424fc7
parenta4d3757b29b5e9affd97cbc4e6fc2d202378610b
parent2a6eaeaa85d17b27ee0dd449183ec197c35c9675
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>
doc/APIchanges
libavcodec/pthread.c
libavutil/cpu.c
libavutil/cpu.h
libavutil/version.h