Michael Niedermayer
|
10336ca640
|
Merge commit '50612484e058e8b241f0528584d64d9d2ccebf12'
* commit '50612484e058e8b241f0528584d64d9d2ccebf12':
pthread: Rename thread_init to avoid symbol collision
Conflicts:
libavcodec/pthread.c
libavfilter/pthread.c
See: 674d8a9629
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
2013-07-17 10:40:15 +02:00 |
|
Sean McGovern
|
50612484e0
|
pthread: Rename thread_init to avoid symbol collision
The AIX threads library exposes a function with the same name.
Signed-off-by: Martin Storsjö <martin@martin.st>
|
2013-07-17 00:13:31 +03:00 |
|
Carl Eugen Hoyos
|
674d8a9629
|
Rename thread_init() in libavcodec and libavfilter as library_thread_init().
The aix header sys/thread.h contains a definition for thread_init().
|
2013-06-30 13:47:45 +02:00 |
|
Dave Yeo
|
e615a77799
|
os2threads: move from lavc to compat/
For useage in other places besides lavc. Needed after commit
90f9a5830b
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2013-05-28 12:49:20 +02:00 |
|
Michael Niedermayer
|
4cf7b87551
|
av_cpu_count: factorize "detected %d logical cores" message
Also print the message just once
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2013-05-26 03:19:55 +02:00 |
|
Michael Niedermayer
|
8d4e969afe
|
Merge commit '129bb238430ec45a3b5f8f1d384df590ddf7b62f'
* commit '129bb238430ec45a3b5f8f1d384df590ddf7b62f':
lavfi: add a slice threading infrastructure
Conflicts:
Changelog
cmdutils.c
doc/APIchanges
libavfilter/Makefile
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.c
libavfilter/internal.h
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
2013-05-24 14:07:00 +02:00 |
|
Anton Khirnov
|
129bb23843
|
lavfi: add a slice threading infrastructure
Mostly based on libavcodec's
|
2013-05-24 09:28:18 +02:00 |
|