[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Dec 26 00:12:43 2013 +0100| [f371a4a57d481e1957038fdf81b6f9d3171e7824] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f371a4a57d481e1957038fdf81b6f9d3171e7824
---