[FFmpeg-cvslog] Merge commit '14abeaa43d021afdce9119d906891abe89c03b88'
Michael Niedermayer
git at videolan.org
Tue Nov 26 01:19:13 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov 26 00:05:38 2013 +0100| [5ded4332f195869df4b8b6b667cdb445113b8e34] | committer: Michael Niedermayer
Merge commit '14abeaa43d021afdce9119d906891abe89c03b88'
* commit '14abeaa43d021afdce9119d906891abe89c03b88':
build: Separate building programs linking against libav* from building av*
Conflicts:
Makefile
doc/Makefile
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5ded4332f195869df4b8b6b667cdb445113b8e34
---
More information about the ffmpeg-cvslog
mailing list