Skip to content
Snippets Groups Projects
Commit fe40a9f9 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '2a6eaeaa' 


* 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: default avatarMichael Niedermayer <michaelni@gmx.at>
parents a4d3757b 2a6eaeaa
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment