[FFmpeg-cvslog] Merge commit '8558595a59913a4667f57d5a4658b1340f1a4354'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec 20 12:48:16 2013 +0100| [3b6e8634c3be16f6a34d9679d0d641e817f0944d] | committer: Michael Niedermayer

Merge commit '8558595a59913a4667f57d5a4658b1340f1a4354'

* commit '8558595a59913a4667f57d5a4658b1340f1a4354':
  configure: Express atomics/thread deps through the dependency system

Conflicts:
	configure

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

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