]> granicus.if.org Git - handbrake/commitdiff
contrib: Only enable pthreads for non-win32 FFmpeg.
authorBradley Sepos <bradley@bradleysepos.com>
Tue, 29 May 2018 06:18:26 +0000 (02:18 -0400)
committerBradley Sepos <bradley@bradleysepos.com>
Tue, 29 May 2018 06:33:57 +0000 (02:33 -0400)
contrib/ffmpeg/module.defs

index 85fdd3224b203a15437828ad63f31de536369721..c44c088d993e055223979d804f75076b5e6140ec 100644 (file)
@@ -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))