diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 19:29:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 19:29:27 +0200 |
| commit | c32db6adab9942781cc5a23f62abb839a5595a83 (patch) | |
| tree | cb082f4a4cb29801263d950edfe8970cad51d259 /presets | |
| parent | 05f1b4e2ecc4683467669a190e3a53df413de805 (diff) | |
| parent | 61c31e4ee7ea79a9e74c0476b81244febf17e6d7 (diff) | |
| download | ffmpeg-c32db6adab9942781cc5a23f62abb839a5595a83.tar.gz | |
Merge commit '61c31e4ee7ea79a9e74c0476b81244febf17e6d7'
* commit '61c31e4ee7ea79a9e74c0476b81244febf17e6d7':
configure: Properly set zlib dependencies for all components
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'presets')
0 files changed, 0 insertions, 0 deletions