]> git.sesse.net Git - ffmpeg/commit
Merge commit '7cbe1ea9df83ec66403fbf6400353bcb2242bf06'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 14 Dec 2013 10:23:57 +0000 (11:23 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 14 Dec 2013 10:23:57 +0000 (11:23 +0100)
commit7431923da8b75835dcabdebc8dcc8c8e28b60a87
tree5481e1ba340aefdefd920599f6991acfac5478d2
parentacda7c8e20dc7cfda038edd0dfbac98f40970111
parent7cbe1ea9df83ec66403fbf6400353bcb2242bf06
Merge commit '7cbe1ea9df83ec66403fbf6400353bcb2242bf06'

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

Conflicts:
configure

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