* qatar/master:
  Enable w32threads automatically unless explicitly disabled
Merged-by: Michael Niedermayer <michaelni@gmx.at>