Files
FFmpeg/libavcodec
Michael Niedermayer fe40a9f98f 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>
2013-05-24 13:24:28 +02:00
..
2013-05-22 21:30:28 +02:00
2013-05-23 12:03:06 +00:00
2013-05-23 10:05:28 +00:00
2013-05-22 20:24:50 +02:00
2013-05-22 20:24:50 +02:00
2013-05-23 20:38:53 +00:00
2013-05-22 17:40:12 +02:00
2013-05-20 21:45:40 +02:00
2013-05-21 12:56:11 +02:00
2013-05-21 17:49:29 +00:00
2013-05-23 12:07:31 +02:00