[FFmpeg-cvslog] Merge commit 'efd26bedec9a345a5960dbfcbaec888418f2d4e6'
Michael Niedermayer
git at videolan.org
Fri Aug 15 20:33:25 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Aug 15 20:25:12 2014 +0200| [3bb22973518cbef28504e4d5b9fd74453cc3339c] | committer: Michael Niedermayer
Merge commit 'efd26bedec9a345a5960dbfcbaec888418f2d4e6'
* commit 'efd26bedec9a345a5960dbfcbaec888418f2d4e6':
build: Add explanatory comments to (optimization) blocks in the Makefiles
Conflicts:
libavcodec/ppc/Makefile
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3bb22973518cbef28504e4d5b9fd74453cc3339c
---
More information about the ffmpeg-cvslog
mailing list