diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-01 13:07:36 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-01 13:07:36 +0100 |
commit | cd88d89493d3988c990d815e9b2a9b8c3a5f6743 (patch) | |
tree | 3e5a19c2f8e3176eddfe278e9a50d7733b83d788 | |
parent | 80793afb177ebfbc2d68327d2ca0380acc734cba (diff) | |
parent | fb3b2f5d923a6e19d80f21eb4e081674bceec810 (diff) | |
download | ffmpeg-streaming-cd88d89493d3988c990d815e9b2a9b8c3a5f6743.zip ffmpeg-streaming-cd88d89493d3988c990d815e9b2a9b8c3a5f6743.tar.gz |
Merge commit 'fb3b2f5d923a6e19d80f21eb4e081674bceec810'
* commit 'fb3b2f5d923a6e19d80f21eb4e081674bceec810':
configure: Set the thread type after resolving dependencies
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rwxr-xr-x | configure | 15 |
1 files changed, 8 insertions, 7 deletions
@@ -4423,13 +4423,6 @@ if ! disabled pthreads && ! enabled w32threads && ! enabled os2threads; then check_code cc "pthread.h" "static pthread_mutex_t atomic_lock = PTHREAD_MUTEX_INITIALIZER" || disable pthreads fi -for thread in $THREADS_LIST; do - if enabled $thread; then - test -n "$thread_type" && - die "ERROR: Only one thread type must be selected." || - thread_type="$thread" - fi -done if enabled pthreads; then check_func pthread_cancel @@ -4911,6 +4904,14 @@ merge_deps() { merge_deps libavfilter $FILTER_LIST +for thread in $THREADS_LIST; do + if enabled $thread; then + test -n "$thread_type" && + die "ERROR: Only one thread type must be selected." || + thread_type="$thread" + fi +done + echo "install prefix $prefix" echo "source path $source_path" echo "C compiler $cc" |