summaryrefslogtreecommitdiff
path: root/libavfilter/pthread.c
Commit message (Collapse)AuthorAge
* Merge commit '50612484e058e8b241f0528584d64d9d2ccebf12'Michael Niedermayer2013-07-17
|\ | | | | | | | | | | | | | | | | | | | | | | * commit '50612484e058e8b241f0528584d64d9d2ccebf12': pthread: Rename thread_init to avoid symbol collision Conflicts: libavcodec/pthread.c libavfilter/pthread.c See: 674d8a9629609a17fd6916164556cb012d6e6a1c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pthread: Rename thread_init to avoid symbol collisionSean McGovern2013-07-17
| | | | | | | | | | | | The AIX threads library exposes a function with the same name. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Rename thread_init() in libavcodec and libavfilter as library_thread_init().Carl Eugen Hoyos2013-06-30
| | | | | | | | The aix header sys/thread.h contains a definition for thread_init().
* | os2threads: move from lavc to compat/Dave Yeo2013-05-28
| | | | | | | | | | | | | | For useage in other places besides lavc. Needed after commit 90f9a5830b5d332de7ebb1ab45589f1870cbd65d Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | av_cpu_count: factorize "detected %d logical cores" messageMichael Niedermayer2013-05-26
| | | | | | | | | | | | Also print the message just once Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '129bb238430ec45a3b5f8f1d384df590ddf7b62f'Michael Niedermayer2013-05-24
|/ | | | | | | | | | | | | | | | | | * 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>
* lavfi: add a slice threading infrastructureAnton Khirnov2013-05-24
Mostly based on libavcodec's