diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-14 11:23:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-14 11:23:57 +0100 |
| commit | 7431923da8b75835dcabdebc8dcc8c8e28b60a87 (patch) | |
| tree | 5481e1ba340aefdefd920599f6991acfac5478d2 /common.mak | |
| parent | acda7c8e20dc7cfda038edd0dfbac98f40970111 (diff) | |
| parent | 7cbe1ea9df83ec66403fbf6400353bcb2242bf06 (diff) | |
| download | ffmpeg-7431923da8b75835dcabdebc8dcc8c8e28b60a87.tar.gz | |
Merge commit '7cbe1ea9df83ec66403fbf6400353bcb2242bf06'
* commit '7cbe1ea9df83ec66403fbf6400353bcb2242bf06':
configure: Move the bz2 and zlib checks below phtreads
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'common.mak')
0 files changed, 0 insertions, 0 deletions