[FFmpeg-cvslog] Merge commit 'a5a3b398fd9dce38ca50b20f182b17a256d209f2'
Michael Niedermayer
git at videolan.org
Sat Dec 14 12:45:46 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Dec 14 11:56:22 2013 +0100| [f5013913da3691121df74c7d57a517c1ca279c53] | committer: Michael Niedermayer
Merge commit 'a5a3b398fd9dce38ca50b20f182b17a256d209f2'
* commit 'a5a3b398fd9dce38ca50b20f182b17a256d209f2':
configure: Reorder pthreads checks
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f5013913da3691121df74c7d57a517c1ca279c53
---
More information about the ffmpeg-cvslog
mailing list