]> git.sesse.net Git - ffmpeg/commit
Merge commit 'a5a3b398fd9dce38ca50b20f182b17a256d209f2'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 14 Dec 2013 10:56:22 +0000 (11:56 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 14 Dec 2013 11:37:40 +0000 (12:37 +0100)
commitf5013913da3691121df74c7d57a517c1ca279c53
treef8e1bba62046427c74e684730d7a38ebbfa79f2b
parent7431923da8b75835dcabdebc8dcc8c8e28b60a87
parenta5a3b398fd9dce38ca50b20f182b17a256d209f2
Merge commit 'a5a3b398fd9dce38ca50b20f182b17a256d209f2'

* commit 'a5a3b398fd9dce38ca50b20f182b17a256d209f2':
  configure: Reorder pthreads checks

Conflicts:
configure

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