diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-10 01:56:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-10 01:56:49 +0100 |
| commit | 2836ef688b4e4ea60c4e013f16334c86898478bb (patch) | |
| tree | f765bbb43a3fbc002957e070ccbf8b9c67412aad /presets | |
| parent | 1311ae8eeeb90247221b5b1fa2690d5ec57daa03 (diff) | |
| parent | 27565164665174034b0e8dc218d13f26b95eed02 (diff) | |
| download | ffmpeg-2836ef688b4e4ea60c4e013f16334c86898478bb.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: Split host and target libc detection
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'presets')
0 files changed, 0 insertions, 0 deletions