Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Explicitly disable w32threads if the test for it fails

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc configure
index 1330209,8cf25ab..9c210e9
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -4334,10 -3848,10 +4334,11 @@@ check_header vdpau/vdpau_x11.
  check_header VideoDecodeAcceleration/VDADecoder.h
  check_header windows.h
  check_header X11/extensions/XvMClib.h
 +check_header asm/types.h
  
  if ! disabled w32threads && ! enabled pthreads; then
-     check_func_headers "windows.h process.h" _beginthreadex && enable w32threads
+     check_func_headers "windows.h process.h" _beginthreadex &&
+         enable w32threads || disable w32threads
  fi
  
  # check for some common methods of building with pthread support