[FFmpeg-cvslog] Merge commit '7cbe1ea9df83ec66403fbf6400353bcb2242bf06'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Dec 14 11:23:57 2013 +0100| [7431923da8b75835dcabdebc8dcc8c8e28b60a87] | committer: Michael Niedermayer

Merge commit '7cbe1ea9df83ec66403fbf6400353bcb2242bf06'

* commit '7cbe1ea9df83ec66403fbf6400353bcb2242bf06':
  configure: Move the bz2 and zlib checks below phtreads

Conflicts:
	configure

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

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