virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-06 08:29:25 +02:00
Code Issues Releases Activity

Merge commit '6bb99757b780144d9fa27cdce09d3621e1a0ed43'

Browse Source 
* commit '6bb99757b780144d9fa27cdce09d3621e1a0ed43':
  jack: Support OSX

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis
2016-05-08 23:01:58 +01:00
parent f3972b3b7d 6bb99757b7
commit dc0152548f
2 changed files with 47 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@@ -4615,7 +4615,8 @@ case $target_os in
enabled x86_64 && objformat="macho64"
enabled_any pic shared x86_64 ||
{ check_cflags -mdynamic-no-pic && add_asflags -mdynamic-no-pic; }
check_header dispatch/dispatch.h
check_header dispatch/dispatch.h &&
add_cppflags '-I\$(SRC_PATH)/compat/dispatch_semaphore'
;;
msys*)
die "Native MSYS builds are discouraged, please use the MINGW environment.";
@@ -5522,6 +5523,9 @@ if enabled pthreads; then
check_func pthread_cancel
fi
enabled pthreads &&
check_builtin sem_timedwait semaphore.h "sem_t *s; sem_init(s,0,0); sem_timedwait(s,0); sem_destroy(s)"
disabled zlib || check_lib zlib.h zlibVersion -lz || disable zlib
disabled bzlib || check_lib2 bzlib.h BZ2_bzlibVersion -lbz2 || disable bzlib
disabled lzma || check_lib2 lzma.h lzma_version_number -llzma || disable lzma