diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-26 00:05:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-26 01:12:24 +0100 |
| commit | 5ded4332f195869df4b8b6b667cdb445113b8e34 (patch) | |
| tree | e226bac305b92bc0d8d3a6113fe270332510768d /libavutil/x86 | |
| parent | 4782c4284fa3856a9b6910fe5ff6e4fb1c65b58c (diff) | |
| parent | 14abeaa43d021afdce9119d906891abe89c03b88 (diff) | |
| download | ffmpeg-5ded4332f195869df4b8b6b667cdb445113b8e34.tar.gz | |
Merge commit '14abeaa43d021afdce9119d906891abe89c03b88'
* commit '14abeaa43d021afdce9119d906891abe89c03b88':
build: Separate building programs linking against libav* from building av*
Conflicts:
Makefile
doc/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/x86')
0 files changed, 0 insertions, 0 deletions