virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  Enable w32threads automatically unless explicitly disabled

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-11-02 00:07:44 +01:00
commit 3638f56dca
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure vendored
View File

@ -93,7 +93,7 @@ Configuration options:
--disable-postproc disable libpostproc build --disable-postproc disable libpostproc build
--disable-avfilter disable video filter support [no] --disable-avfilter disable video filter support [no]
--disable-pthreads disable pthreads [auto] --disable-pthreads disable pthreads [auto]
--enable-w32threads use Win32 threads [no] --disable-w32threads disable Win32 threads [auto]
--enable-x11grab enable X11 grabbing [no] --enable-x11grab enable X11 grabbing [no]
--disable-network disable network support [no] --disable-network disable network support [no]
--enable-gray enable full grayscale support (slower color) --enable-gray enable full grayscale support (slower color)
@ -2564,6 +2564,7 @@ case $target_os in
disable network disable network
else else
target_os=mingw32 target_os=mingw32
enable_weak w32threads
fi fi
LIBTARGET=i386 LIBTARGET=i386
if enabled x86_64; then if enabled x86_64; then