diff options
| author | Bradley Sepos <[email protected]> | 2018-05-29 02:18:26 -0400 |
|---|---|---|
| committer | Bradley Sepos <[email protected]> | 2018-05-29 02:33:57 -0400 |
| commit | 49cb4308aa8d3197b9c7be426dfad8ee9baf5b09 (patch) | |
| tree | 905f7120e5f6a1a5a373e33d5c93ed8b7cd54491 | |
| parent | 2827c02458a678d2c3568b60eb9cc76734d085b1 (diff) | |
contrib: Only enable pthreads for non-win32 FFmpeg.
| -rw-r--r-- | contrib/ffmpeg/module.defs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs index 85fdd3224..c44c088d9 100644 --- a/contrib/ffmpeg/module.defs +++ b/contrib/ffmpeg/module.defs @@ -1,7 +1,4 @@ __deps__ := YASM BZIP2 ZLIB FDKAAC LIBVPX LAME LIBOPUS -ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system)) -__deps__ += PTHREADW32 -endif ifeq (1,$(FEATURE.qsv)) __deps__ += LIBMFX endif @@ -64,7 +61,6 @@ FFMPEG.CONFIGURE.extra = \ --disable-decoder=wmv3_crystalhd \ --enable-zlib \ --enable-bzlib \ - --enable-pthreads \ --cc="$(FFMPEG.GCC.gcc)" \ --extra-ldflags="$(call fn.ARGS,FFMPEG.GCC,*archs *sysroot *minver ?extra) -L$(call fn.ABSOLUTE,$(CONTRIB.build/)lib)" @@ -101,6 +97,9 @@ else ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system)) else FFMPEG.CONFIGURE.extra += --pkg-config=$(PKGCONFIG.exe) endif +else + # only enable pthreads for non-win32 + FFMPEG.CONFIGURE.extra += --enable-pthreads endif ifneq (none,$(FFMPEG.GCC.g)) |