Age | Commit message (Collapse) | Author |
|
|
|
This was somehow forgotten in a8bb81a05c519dd3f36cc341e5fb448f6d17fa73.
|
|
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
This is similar to 5152196b2b47d446d9a509b9bfb318daa26a1f2b.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
|
|
* commit 'eb90a2091ffb94d8c29aaa5ff50f4192520254fc':
pthread: Fix deadlock during thread initialization
Conflicts:
libavcodec/pthread.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Sometimes, if pthread_create() failed, then pthread_cond_wait() could
accidentally be called in the worker threads after the uninit function
had already called pthread_cond_broadcast(), leading to a deadlock.
Don't call pthread_cond_wait() if c->done is set.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
|
|
* qatar/master:
lavfi: allow user-provided execute() callbacks
Conflicts:
libavfilter/avfilter.h
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
|
|
* 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>
|
|
The AIX threads library exposes a function with the same name.
Signed-off-by: Martin Storsjö <martin@martin.st>
|
|
The aix header sys/thread.h contains a definition for thread_init().
|
|
For useage in other places besides lavc. Needed after commit
90f9a5830b5d332de7ebb1ab45589f1870cbd65d
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
Also print the message just once
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
|
* 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>
|
|
Mostly based on libavcodec's
|