diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-24 13:13:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-24 13:24:28 +0200 |
| commit | fe40a9f98f599699b0989d8c8cb35cb24eb2e52f (patch) | |
| tree | f4ee45ae1a0762edc121ea98ce03d39557424fc7 /libavfilter/avfiltergraph.c | |
| parent | a4d3757b29b5e9affd97cbc4e6fc2d202378610b (diff) | |
| parent | 2a6eaeaa85d17b27ee0dd449183ec197c35c9675 (diff) | |
| download | ffmpeg-fe40a9f98f599699b0989d8c8cb35cb24eb2e52f.tar.gz | |
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>
Diffstat (limited to 'libavfilter/avfiltergraph.c')
0 files changed, 0 insertions, 0 deletions