diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-02 00:07:44 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-02 00:07:51 +0100 |
| commit | 3638f56dca167a408b6da7fb78cade08780f7d85 (patch) | |
| tree | 33845c2f14c535096353e07fc84570e6fa9b1b87 /configure | |
| parent | 3fd0f6ed252e51ffaec7765a2637794366a513ba (diff) | |
| parent | 7b7b220cf709f193e5e79b5fc83b51196aab7cf6 (diff) | |
| download | ffmpeg-3638f56dca167a408b6da7fb78cade08780f7d85.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Enable w32threads automatically unless explicitly disabled
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -93,7 +93,7 @@ Configuration options: --disable-postproc disable libpostproc build --disable-avfilter disable video filter support [no] --disable-pthreads disable pthreads [auto] - --enable-w32threads use Win32 threads [no] + --disable-w32threads disable Win32 threads [auto] --enable-x11grab enable X11 grabbing [no] --disable-network disable network support [no] --enable-gray enable full grayscale support (slower color) @@ -2564,6 +2564,7 @@ case $target_os in disable network else target_os=mingw32 + enable_weak w32threads fi LIBTARGET=i386 if enabled x86_64; then |