[FFmpeg-cvslog] Merge commit 'fb3b2f5d923a6e19d80f21eb4e081674bceec810'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar  1 13:07:36 2014 +0100| [cd88d89493d3988c990d815e9b2a9b8c3a5f6743] | committer: Michael Niedermayer

Merge commit 'fb3b2f5d923a6e19d80f21eb4e081674bceec810'

* commit 'fb3b2f5d923a6e19d80f21eb4e081674bceec810':
  configure: Set the thread type after resolving dependencies

Conflicts:
	configure

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

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